diff options
| author | Matthew Barnes <mbarnes@redhat.com> | 2010-10-29 08:22:32 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@redhat.com> | 2010-10-30 01:51:39 +0800 |
| commit | 0faef9453c27a1a65ac15bfa65925056e5dd551d (patch) | |
| tree | 2e836195d89806b91c4a457d1affcead00c5f41f | |
| parent | ffcadeeaa38d0cdeda9558d2d32d523ac2c69b51 (diff) | |
| download | gsoc2013-evolution-0faef9453c27a1a65ac15bfa65925056e5dd551d.tar.gz gsoc2013-evolution-0faef9453c27a1a65ac15bfa65925056e5dd551d.tar.zst gsoc2013-evolution-0faef9453c27a1a65ac15bfa65925056e5dd551d.zip | |
Revert "gnome-canvas: Fix bounding box calculation in GnomeCanvasShape"
This reverts commit ecd07f3f735debf9bad03543394f3db0f0714b8a.
Actually you do want world coordinates, but the typo fixed in the
next commit was probably causing strange and confusing behavior.
| -rw-r--r-- | libgnomecanvas/gnome-canvas-shape.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/libgnomecanvas/gnome-canvas-shape.c b/libgnomecanvas/gnome-canvas-shape.c index 0ef588c97c..37ad4a5e18 100644 --- a/libgnomecanvas/gnome-canvas-shape.c +++ b/libgnomecanvas/gnome-canvas-shape.c @@ -533,6 +533,7 @@ 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); @@ -543,7 +544,9 @@ 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_matrix_transform_rect (i2c, &x1, &y1, &x2, &y2); + gnome_canvas_item_i2w_matrix (item, &matrix); + + gnome_canvas_matrix_transform_rect (&matrix, &x1, &y1, &x2, &y2); gnome_canvas_update_bbox (GNOME_CANVAS_ITEM (shape), floor (x1), floor (y1), ceil (x2), ceil (y2)); |