summaryrefslogtreecommitdiffstats
path: root/src/selcue.cpp
diff options
context:
space:
mode:
authorKrzysztof Kosi??ski <tweenk.pl@gmail.com>2011-08-27 09:04:37 +0000
committerKrzysztof Kosinski <tweenk.pl@gmail.com>2011-08-27 09:04:37 +0000
commit72cc39b9f0b340548f395c7f61ca9662b34aea09 (patch)
tree34a0853cff6c6040bc2a0572dfa365280fce2601 /src/selcue.cpp
parentFix "snap guides" toggle (diff)
downloadinkscape-72cc39b9f0b340548f395c7f61ca9662b34aea09.tar.gz
inkscape-72cc39b9f0b340548f395c7f61ca9662b34aea09.zip
Refactor SPItem bounding box methods: remove NRRect usage and make code
using them more obvious. Fix filter region computation. (bzr r10582.1.1)
Diffstat (limited to 'src/selcue.cpp')
-rw-r--r--src/selcue.cpp10
1 files changed, 4 insertions, 6 deletions
diff --git a/src/selcue.cpp b/src/selcue.cpp
index c647c1f96..dbcaf4cc3 100644
--- a/src/selcue.cpp
+++ b/src/selcue.cpp
@@ -68,8 +68,6 @@ void Inkscape::SelCue::_updateItemBboxes()
g_return_if_fail(_selection != NULL);
int prefs_bbox = prefs->getBool("/tools/bounding_box");
- SPItem::BBoxType bbox_type = !prefs_bbox ?
- SPItem::APPROXIMATE_BBOX : SPItem::GEOMETRIC_BBOX;
GSList const *items = _selection->itemList();
if (_item_bboxes.size() != g_slist_length((GSList *) items)) {
@@ -83,7 +81,8 @@ void Inkscape::SelCue::_updateItemBboxes()
SPCanvasItem* box = _item_bboxes[bcount ++];
if (box) {
- Geom::OptRect const b = item->getBboxDesktop(bbox_type);
+ Geom::OptRect const b = (prefs_bbox == 0) ?
+ item->desktopVisualBounds() : item->desktopGeometricBounds();
if (b) {
sp_canvas_item_show(box);
@@ -118,13 +117,12 @@ void Inkscape::SelCue::_newItemBboxes()
g_return_if_fail(_selection != NULL);
int prefs_bbox = prefs->getBool("/tools/bounding_box");
- SPItem::BBoxType bbox_type = !prefs_bbox ?
- SPItem::APPROXIMATE_BBOX : SPItem::GEOMETRIC_BBOX;
for (GSList const *l = _selection->itemList(); l != NULL; l = l->next) {
SPItem *item = (SPItem *) l->data;
- Geom::OptRect const b = item->getBboxDesktop(bbox_type);
+ Geom::OptRect const b = (prefs_bbox == 0) ?
+ item->desktopVisualBounds() : item->desktopGeometricBounds();
SPCanvasItem* box = NULL;