summaryrefslogtreecommitdiffstats
path: root/src/object-set.cpp
diff options
context:
space:
mode:
authorJabier Arraiza Cenoz <jabier.arraiza@marker.es>2016-11-05 17:10:22 +0000
committerjabiertxof <info@marker.es>2016-11-05 17:10:22 +0000
commit218c1acafd09c2b2469db082cf6e389869f9c48e (patch)
treec7324d131df0a85effbc548e1ee35446aff25fdd /src/object-set.cpp
parentFix angle constrain, thanks to vlada, Mc and LiamW (diff)
parentMove a header place (diff)
downloadinkscape-218c1acafd09c2b2469db082cf6e389869f9c48e.tar.gz
inkscape-218c1acafd09c2b2469db082cf6e389869f9c48e.zip
Update to trunk
(bzr r15142.1.30)
Diffstat (limited to 'src/object-set.cpp')
-rw-r--r--src/object-set.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/object-set.cpp b/src/object-set.cpp
index fd0b908d1..65e7d45d6 100644
--- a/src/object-set.cpp
+++ b/src/object-set.cpp
@@ -204,7 +204,7 @@ SPItem *ObjectSet::_sizeistItem(bool sml, CompareSize compare) {
SPItem *ist = NULL;
for (auto i = items.begin(); i != items.end(); ++i) {
- Geom::OptRect obox = SP_ITEM(*i)->desktopPreferredBounds();
+ Geom::OptRect obox = SP_ITEM(*i)->documentPreferredBounds();
if (!obox || obox.empty()) {
continue;
}
@@ -212,7 +212,7 @@ SPItem *ObjectSet::_sizeistItem(bool sml, CompareSize compare) {
Geom::Rect bbox = *obox;
gdouble size = compare == AREA ? bbox.area() :
- (compare == VERTICAL ? bbox.width() : bbox.height());
+ (compare == VERTICAL ? bbox.height() : bbox.width());
size = sml ? size : size * -1;
if (size < max) {
max = size;