diff options
| author | Jabier Arraiza Cenoz <jabier.arraiza@marker.es> | 2015-01-24 09:58:32 +0000 |
|---|---|---|
| committer | Jabiertxof <jtx@jtx.marker.es> | 2015-01-24 09:58:32 +0000 |
| commit | e670856c8810c2733ce95e5f31c822cf20030367 (patch) | |
| tree | ff3d2c135a871bf5a66a066ee8bd58fa602559cd /src/ui/widget/registered-widget.cpp | |
| parent | Added the remove for outer staff to kaleidoscope (diff) | |
| parent | * [INTL:sk] Slovak translation update (diff) | |
| download | inkscape-e670856c8810c2733ce95e5f31c822cf20030367.tar.gz inkscape-e670856c8810c2733ce95e5f31c822cf20030367.zip | |
update to trunk
(bzr r13708.1.13)
Diffstat (limited to 'src/ui/widget/registered-widget.cpp')
| -rw-r--r-- | src/ui/widget/registered-widget.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/ui/widget/registered-widget.cpp b/src/ui/widget/registered-widget.cpp index bbf542987..298377af3 100644 --- a/src/ui/widget/registered-widget.cpp +++ b/src/ui/widget/registered-widget.cpp @@ -245,7 +245,10 @@ RegisteredScalarUnit::on_value_changed() if (doc) { SPRoot *root = doc->getRoot(); if (root->viewBox_set) { - if (_user_units == RSU_x) { + // check to see if scaling is uniform + if(Geom::are_near((root->viewBox.width() * root->height.computed) / (root->width.computed * root->viewBox.height()), 1.0, Geom::EPSILON)) { + scale = (root->viewBox.width() / root->width.computed + root->viewBox.height() / root->height.computed)/2.0; + } else if (_user_units == RSU_x) { scale = root->viewBox.width() / root->width.computed; } else { scale = root->viewBox.height() / root->height.computed; |