diff options
| author | Jabier Arraiza Cenoz <jabier.arraiza@marker.es> | 2016-11-05 17:10:22 +0000 |
|---|---|---|
| committer | jabiertxof <info@marker.es> | 2016-11-05 17:10:22 +0000 |
| commit | 218c1acafd09c2b2469db082cf6e389869f9c48e (patch) | |
| tree | c7324d131df0a85effbc548e1ee35446aff25fdd /src/selection-chemistry.cpp | |
| parent | Fix angle constrain, thanks to vlada, Mc and LiamW (diff) | |
| parent | Move a header place (diff) | |
| download | inkscape-218c1acafd09c2b2469db082cf6e389869f9c48e.tar.gz inkscape-218c1acafd09c2b2469db082cf6e389869f9c48e.zip | |
Update to trunk
(bzr r15142.1.30)
Diffstat (limited to 'src/selection-chemistry.cpp')
| -rw-r--r-- | src/selection-chemistry.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/selection-chemistry.cpp b/src/selection-chemistry.cpp index 2f9e72e2c..2db059afe 100644 --- a/src/selection-chemistry.cpp +++ b/src/selection-chemistry.cpp @@ -946,7 +946,7 @@ enclose_items(std::vector<SPItem*> const &items) Geom::OptRect r; for (std::vector<SPItem*>::const_iterator i = items.begin();i!=items.end();++i) { - r.unionWith((*i)->desktopVisualBounds()); + r.unionWith((*i)->documentVisualBounds()); } return r; } @@ -1000,7 +1000,7 @@ void ObjectSet::raise(bool skip_undo){ // if the sibling is an item AND overlaps our selection, SPItem *newItem = dynamic_cast<SPItem *>(newref); if (newItem) { - Geom::OptRect newref_bbox = newItem->desktopVisualBounds(); + Geom::OptRect newref_bbox = newItem->documentVisualBounds(); if ( newref_bbox && selected->intersects(*newref_bbox) ) { // AND if it's not one of our selected objects, if ( std::find(items_copy.begin(),items_copy.end(),newref)==items_copy.end()) { @@ -1077,7 +1077,7 @@ void ObjectSet::lower(bool skip_undo){ // if the sibling is an item AND overlaps our selection, SPItem *newItem = dynamic_cast<SPItem *>(newref); if (newItem) { - Geom::OptRect ref_bbox = newItem->desktopVisualBounds(); + Geom::OptRect ref_bbox = newItem->documentVisualBounds(); if ( ref_bbox && selected->intersects(*ref_bbox) ) { // AND if it's not one of our selected objects, if (items_copy.end()==std::find(items_copy.begin(),items_copy.end(),newref)) { |