ardour/livetrax
13
0
Fork 0
Code

fix up ordering of rounding error handling for simpleline

Browse Source 
git-svn-id: svn://localhost/ardour2/branches/3.0@8363 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Paul Davis 2010-12-29 14:37:34 +00:00
parent 3367dc3671
commit a06c33b6d9
1 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
gtk2_ardour/canvas-simpleline.c
View File

@ -317,28 +317,28 @@ gnome_canvas_simpleline_update (GnomeCanvasItem *item, double *affine, ArtSVP *c
gnome_canvas_item_i2w (item, &x1, &y1); gnome_canvas_item_i2w (item, &x1, &y1);
gnome_canvas_item_i2w (item, &x2, &y2); gnome_canvas_item_i2w (item, &x2, &y2);
/* don't suffer from rounding errors */
x1 = floor (x1);
y1 = floor (y1);
x2 = ceil (x2);
y2 = ceil (y2);
/* force non-zero dimensionality for both axes */
if (x1 == x2) {
x2 += 1.0;
}
if (y1 == y2) {
y2 += 1.0;
}
/* reset item bounding box (canvas coordinates, so integral. but stored in doubles) */ /* reset item bounding box (canvas coordinates, so integral. but stored in doubles) */
gnome_canvas_w2c_d (GNOME_CANVAS(item->canvas), x1, y1, &item->x1, &item->y1); gnome_canvas_w2c_d (GNOME_CANVAS(item->canvas), x1, y1, &item->x1, &item->y1);
gnome_canvas_w2c_d (GNOME_CANVAS(item->canvas), x2, y2, &item->x2, &item->y2); gnome_canvas_w2c_d (GNOME_CANVAS(item->canvas), x2, y2, &item->x2, &item->y2);
/* don't suffer from rounding errors */
item->x1 = floor (item->x1);
item->y1 = floor (item->y1);
item->x2 = ceil (item->x2);
item->y2 = ceil (item->y2);
/* force non-zero dimensionality for both axes */
if (item->x1 == item->x2) {
item->x2 += 1.0;
}
if (item->y1 == item->y2) {
item->y2 += 1.0;
}
/* redraw new location */ /* redraw new location */
gnome_canvas_request_redraw (item->canvas, item->x1, item->y1, item->x2, item->y2); gnome_canvas_request_redraw (item->canvas, item->x1, item->y1, item->x2, item->y2);