aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBenjamin Otte <otte@redhat.com>2010-10-17 21:33:12 +0800
committerMatthew Barnes <mbarnes@redhat.com>2010-10-30 01:50:01 +0800
commita97de21bd2726c985372b528249cf383a4966739 (patch)
treeabedba7c63c157d8acdfab59b1414830e2812110
parentb85e0b42a2465c92d4665acec80a7a019f919abc (diff)
downloadgsoc2013-evolution-a97de21bd2726c985372b528249cf383a4966739.tar.gz
gsoc2013-evolution-a97de21bd2726c985372b528249cf383a4966739.tar.zst
gsoc2013-evolution-a97de21bd2726c985372b528249cf383a4966739.zip
gnome-canvas: Fix bounding box calculation in GnomeCanvasShape
The code converted the bbox to world coordinates, not to canvas coordinates. xxx: shape
-rw-r--r--libgnomecanvas/gnome-canvas-shape.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/libgnomecanvas/gnome-canvas-shape.c b/libgnomecanvas/gnome-canvas-shape.c
index 346230afde..334eff8b77 100644
--- a/libgnomecanvas/gnome-canvas-shape.c
+++ b/libgnomecanvas/gnome-canvas-shape.c
@@ -517,7 +517,6 @@ gnome_canvas_shape_update (GnomeCanvasItem *item, const cairo_matrix_t *i2c, gin
GnomeCanvasShape * shape;
GnomeCanvasShapePriv * priv;
double x1, x2, y1, y2;
- cairo_matrix_t matrix;
shape = GNOME_CANVAS_SHAPE (item);
@@ -528,9 +527,7 @@ gnome_canvas_shape_update (GnomeCanvasItem *item, const cairo_matrix_t *i2c, gin
GNOME_CANVAS_ITEM_CLASS (gnome_canvas_shape_parent_class)->update (item, i2c, flags);
gnome_canvas_shape_bounds (item, &x1, &x2, &y1, &y2);
- gnome_canvas_item_i2w_matrix (item, &matrix);
-
- gnome_canvas_matrix_transform_rect (&matrix, &x1, &y1, &x2, &y2);
+ gnome_canvas_matrix_transform_rect (i2c, &x1, &y1, &x2, &y2);
gnome_canvas_update_bbox (GNOME_CANVAS_ITEM (shape),
floor (x1), floor (y1),
ceil (x2), ceil (y2));