From 0f85e2c60c4406eaddc7a96d8ddcc05d36d458f2 Mon Sep 17 00:00:00 2001
From: Martin Owens <doctormo@gmail.com>
Date: Wed, 18 Sep 2013 14:46:36 -0400
Subject: Remove setItemBounds and _item_bbox because aren't sensible, replace
 with bbox.

Fixed bugs:
  - https://launchpad.net/bugs/243729

(bzr r12528)
---
 src/sp-item.cpp | 12 ------------
 1 file changed, 12 deletions(-)

(limited to 'src/sp-item.cpp')

diff --git a/src/sp-item.cpp b/src/sp-item.cpp
index a4070c9b3..3bcb1f132 100644
--- a/src/sp-item.cpp
+++ b/src/sp-item.cpp
@@ -644,17 +644,6 @@ sp_item_update(SPObject *object, SPCtx *ctx, guint flags)
         }
     }
 
-    /* Update bounding box data used by filters */
-    if (item->style->filter.set && item->display) {
-        Geom::OptRect item_bbox = item->visualBounds();
-
-        SPItemView *itemview = item->display;
-        do {
-            if (itemview->arenaitem)
-                itemview->arenaitem->setItemBounds(item_bbox);
-        } while ( (itemview = itemview->next) );
-    }
-
     // Update libavoid with item geometry (for connector routing).
     if (item->avoidRef)
         item->avoidRef->handleSettingChange();
@@ -1093,7 +1082,6 @@ Inkscape::DrawingItem *SPItem::invoke_show(Inkscape::Drawing &drawing, unsigned
             item_bbox = visualBounds();
         }
         ai->setData(this);
-        ai->setItemBounds(item_bbox);
     }
 
     return ai;
-- 
cgit v1.2.3


From 23b4c7fcb81ee195acb9bfd470723728f89bfc4a Mon Sep 17 00:00:00 2001
From: Martin Owens <doctormo@gmail.com>
Date: Thu, 19 Sep 2013 08:35:32 -0400
Subject: Revert some agressive changes and allow a seperate filter bbox for
 FER, should be refactored at some point.

(bzr r12536)
---
 src/sp-item.cpp | 10 ++++++++++
 1 file changed, 10 insertions(+)

(limited to 'src/sp-item.cpp')

diff --git a/src/sp-item.cpp b/src/sp-item.cpp
index 52ccdbdd4..e6991a1fa 100644
--- a/src/sp-item.cpp
+++ b/src/sp-item.cpp
@@ -601,6 +601,15 @@ void SPItem::update(SPCtx *ctx, guint flags) {
             }
         }
     }
+    /* Update bounding box data used by filters */
+    if (item->style->filter.set && item->display) {
+        Geom::OptRect item_bbox = item->visualBounds();
+        SPItemView *itemview = item->display;
+        do {
+            if (itemview->arenaitem)
+                itemview->arenaitem->setItemBounds(item_bbox);
+        } while ( (itemview = itemview->next) );
+    }
 
     // Update libavoid with item geometry (for connector routing).
     if (item->avoidRef)
@@ -1050,6 +1059,7 @@ Inkscape::DrawingItem *SPItem::invoke_show(Inkscape::Drawing &drawing, unsigned
             item_bbox = visualBounds();
         }
         ai->setData(this);
+        ai->setItemBounds(item_bbox);
     }
 
     return ai;
-- 
cgit v1.2.3