Refactor SPItem bounding box methods: remove NRRect usage and make code

using them more obvious. Fix filter region computation.

(bzr r10582.1.1)

5 files changed, 11 insertions, 14 deletions

diff --git a/src/widgets/desktop-widget.cpp b/src/widgets/desktop-widget.cpp
index 08f0eadfb..fff9c0a5c 100644
--- a/src/widgets/desktop-widget.cpp
+++ b/src/widgets/desktop-widget.cpp
@@ -1881,7 +1881,7 @@ sp_desktop_widget_update_scrollbars (SPDesktopWidget *dtw, double scale)
     Geom::Rect darea ( Geom::Point(-doc->getWidth(), -doc->getHeight()),
                      Geom::Point(2 * doc->getWidth(), 2 * doc->getHeight())  );
 
-    Geom::OptRect deskarea = darea | doc->getRoot()->getBboxDesktop();
+    Geom::OptRect deskarea = darea | doc->getRoot()->desktopVisualBounds();
 
     /* Canvas region we always show unconditionally */
     Geom::Rect carea( Geom::Point(deskarea->min()[Geom::X] * scale - 64, deskarea->max()[Geom::Y] * -scale - 64),
diff --git a/src/widgets/icon.cpp b/src/widgets/icon.cpp
index a57b56b5c..9540b59d6 100644
--- a/src/widgets/icon.cpp
+++ b/src/widgets/icon.cpp
@@ -1102,8 +1102,7 @@ sp_icon_doc_icon( SPDocument *doc, Inkscape::Drawing &drawing,
         if (object && SP_IS_ITEM(object)) {
             SPItem *item = SP_ITEM(object);
             // Find bbox in document
-            Geom::Affine const i2doc(item->i2doc_affine());
-            Geom::OptRect dbox = item->getBounds(i2doc);
+            Geom::OptRect dbox = item->documentVisualBounds();
 
             if ( object->parent == NULL )
             {
diff --git a/src/widgets/select-toolbar.cpp b/src/widgets/select-toolbar.cpp
index 260c09c69..5f90a8997 100644
--- a/src/widgets/select-toolbar.cpp
+++ b/src/widgets/select-toolbar.cpp
@@ -70,7 +70,7 @@ sp_selection_layout_widget_update(SPWidget *spw, Inkscape::Selection *sel)
     if ( sel && !sel->isEmpty() ) {
         int prefs_bbox = prefs->getInt("/tools/bounding_box", 0);
         SPItem::BBoxType bbox_type = (prefs_bbox ==0)?
-            SPItem::APPROXIMATE_BBOX : SPItem::GEOMETRIC_BBOX;
+            SPItem::VISUAL_BBOX : SPItem::GEOMETRIC_BBOX;
         Geom::OptRect const bbox(sel->bounds(bbox_type));
         if ( bbox ) {
             UnitTracker *tracker = reinterpret_cast<UnitTracker*>(g_object_get_data(G_OBJECT(spw), "tracker"));
@@ -160,12 +160,12 @@ sp_object_layout_any_value_changed(GtkAdjustment *adj, SPWidget *spw)
     document->ensureUpToDate ();
     Inkscape::Preferences *prefs = Inkscape::Preferences::get();
 
-    Geom::OptRect bbox_vis = selection->bounds(SPItem::APPROXIMATE_BBOX);
-    Geom::OptRect bbox_geom = selection->bounds(SPItem::GEOMETRIC_BBOX);
+    Geom::OptRect bbox_vis = selection->visualBounds();
+    Geom::OptRect bbox_geom = selection->geometricBounds();
 
     int prefs_bbox = prefs->getInt("/tools/bounding_box");
     SPItem::BBoxType bbox_type = (prefs_bbox == 0)?
-        SPItem::APPROXIMATE_BBOX : SPItem::GEOMETRIC_BBOX;
+        SPItem::VISUAL_BBOX : SPItem::GEOMETRIC_BBOX;
     Geom::OptRect bbox_user = selection->bounds(bbox_type);
 
     if ( !bbox_user ) {
@@ -247,10 +247,10 @@ sp_object_layout_any_value_changed(GtkAdjustment *adj, SPWidget *spw)
         int transform_stroke = prefs->getBool("/options/transform/stroke", true) ? 1 : 0;
 
         Geom::Affine scaler;
-        if (bbox_type == SPItem::APPROXIMATE_BBOX) {
+        if (bbox_type == SPItem::VISUAL_BBOX) {
             scaler = get_scale_transform_with_unequal_stroke (*bbox_vis, *bbox_geom, transform_stroke, x0, y0, x1, y1);
         } else {
-            // get_scale_transform_with_stroke() is intended for VISUAL (or APPROXIMATE) bounding boxes, not geometrical ones!
+            // get_scale_transform_with_stroke() is intended for visual bounding boxes, not geometrical ones!
             // we'll trick it into using a geometric bounding box though, by setting the stroke width to zero
             scaler = get_scale_transform_with_uniform_stroke (*bbox_user, 0, false, x0, y0, x1, y1);
         }
diff --git a/src/widgets/stroke-style.cpp b/src/widgets/stroke-style.cpp
index 8d9b9b429..bb9391c78 100644
--- a/src/widgets/stroke-style.cpp
+++ b/src/widgets/stroke-style.cpp
@@ -191,8 +191,7 @@ sp_marker_prev_new(unsigned psize, gchar const *mname,
 
     SPItem *item = SP_ITEM(object);
     // Find object's bbox in document
-    Geom::Affine const i2doc(item->i2doc_affine());
-    Geom::OptRect dbox = item->getBounds(i2doc);
+    Geom::OptRect dbox = item->documentVisualBounds();
 
     if (!dbox) {
         return NULL;
diff --git a/src/widgets/toolbox.cpp b/src/widgets/toolbox.cpp
index 26947979d..61c7c8e88 100644
--- a/src/widgets/toolbox.cpp
+++ b/src/widgets/toolbox.cpp
@@ -5951,7 +5951,7 @@ static void lpetool_toggle_set_bbox(GtkToggleAction *act, gpointer data)
     SPDesktop *desktop = static_cast<SPDesktop *>(data);
     Inkscape::Selection *selection = desktop->selection;
 
-    Geom::OptRect bbox = selection->bounds();
+    Geom::OptRect bbox = selection->visualBounds();
 
     if (bbox) {
         Geom::Point A(bbox->min());
@@ -6799,8 +6799,7 @@ static void sp_text_align_mode_changed( EgeSelectOneAction *act, GObject *tbl )
                 axis = Geom::Y;
             }
 
-            Geom::OptRect bbox
-                  = item->getBounds(Geom::identity(), SPItem::GEOMETRIC_BBOX);
+            Geom::OptRect bbox = item->geometricBounds();
             if (!bbox)
                 continue;
             double width = bbox->dimensions()[axis];