smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-10 16:46:35 +01:00
Code Issues Projects Releases Wiki Activity

change rounding used for convert Rect from canvas to window coordinates

Browse source
This commit is contained in:
Paul Davis 2014-01-08 10:31:14 -05:00
parent 98dec658ee
commit a70edc5765
1 changed files with 12 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

16
libs/canvas/canvas.cc
View file

@ -195,8 +195,12 @@ Duple
Canvas::canvas_to_window (Duple const & d) const Canvas::canvas_to_window (Duple const & d) const
{ {
Duple wd = d.translate (Duple (-_scroll_offset_x, -_scroll_offset_y)); Duple wd = d.translate (Duple (-_scroll_offset_x, -_scroll_offset_y));
/* Note that this intentionally always returns integer coordinates */
wd.x = round (wd.x); wd.x = round (wd.x);
wd.y = round (wd.y); wd.y = round (wd.y);
return wd; return wd;
} }
@ -210,10 +214,14 @@ Rect
Canvas::canvas_to_window (Rect const & r) const Canvas::canvas_to_window (Rect const & r) const
{ {
Rect wr = r.translate (Duple (-_scroll_offset_x, -_scroll_offset_y)); Rect wr = r.translate (Duple (-_scroll_offset_x, -_scroll_offset_y));
wr.x0 = floor (wr.x0);
wr.x1 = ceil (wr.x1); /* Note that this intentionally always returns integer coordinates */
wr.y0 = floor (wr.y0);
wr.y1 = ceil (wr.y1); wr.x0 = round (wr.x0);
wr.x1 = round (wr.x1);
wr.y0 = round (wr.y0);
wr.y1 = round (wr.y1);
return wr; return wr;
} }