merge onecanvas and cairocanvas branches, and manually resolve conflicts, including rounding in item_to_window() methods

This commit is contained in:
Paul Davis 2014-06-03 16:37:53 -04:00
parent e8e3460665
commit fdbb93ea3c
3 changed files with 10 additions and 3 deletions

View file

@ -148,6 +148,11 @@ public:
void canvas_to_item (Coord &, Coord &) const;
void item_to_canvas (Coord &, Coord &) const;
Duple canvas_to_item (Duple const&) const;
Rect item_to_canvas (Rect const&) const;
Duple item_to_canvas (Duple const&) const;
Rect canvas_to_item (Rect const&) const;
Duple item_to_window (Duple const&, bool rounded = true) const;
Duple window_to_item (Duple const&) const;
Rect item_to_window (Rect const&) const;