diff options
| author | Alvin Penner <penner@vaxxine.com> | 2015-01-23 20:39:50 +0000 |
|---|---|---|
| committer | apenner <penner@vaxxine.com> | 2015-01-23 20:39:50 +0000 |
| commit | 4b34a53a8122919e53ce2e13627e2007fafec0db (patch) | |
| tree | 79afc31ea2a1e3c53101b2496578f6d0a4ee503d /src/ui/widget | |
| parent | Fix regression: pasted bitmaps should be embeded. (Bug #855440) (diff) | |
| download | inkscape-4b34a53a8122919e53ce2e13627e2007fafec0db.tar.gz inkscape-4b34a53a8122919e53ce2e13627e2007fafec0db.zip | |
improved precision in placing grids and guides. (Bug 1373311)
Fixed bugs:
- https://launchpad.net/bugs/1373311
(bzr r13868)
Diffstat (limited to 'src/ui/widget')
| -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; |