diff options
author | Paul Davis <paul@linuxaudiosystems.com> | 2014-06-03 16:37:53 -0400 |
---|---|---|
committer | Paul Davis <paul@linuxaudiosystems.com> | 2014-06-03 16:37:53 -0400 |
commit | 8fa81c1436335a44577cbb725a53b40fac56adaa (patch) | |
tree | 67898238fb35540b654686a70f0269fb7924c422 /libs/canvas/item.cc | |
parent | e0533e9dd7df504236892fe0d8693e7ad9a6a278 (diff) |
merge onecanvas and cairocanvas branches, and manually resolve conflicts, including rounding in item_to_window() methods
Diffstat (limited to 'libs/canvas/item.cc')
-rw-r--r-- | libs/canvas/item.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/libs/canvas/item.cc b/libs/canvas/item.cc index ddc05a817a..bab6e73b54 100644 --- a/libs/canvas/item.cc +++ b/libs/canvas/item.cc @@ -173,8 +173,10 @@ Item::item_to_window (ArdourCanvas::Duple const & d, bool rounded) const { Duple ret = item_to_canvas (d).translate (-scroll_offset()); - ret.x = round (ret.x); - ret.y = round (ret.y); + if (rounded) { + ret.x = round (ret.x); + ret.y = round (ret.y); + } return ret; } |