summaryrefslogtreecommitdiffstats
path: root/src/verbs.cpp
diff options
context:
space:
mode:
authorJohan B. C. Engelen <jbc.engelen@swissonline.ch>2014-11-24 19:56:53 +0000
committerJohan B. C. Engelen <j.b.c.engelen@alumnus.utwente.nl>2014-11-24 19:56:53 +0000
commitbad0504958a10f1b99db3ae2557305541f388a52 (patch)
tree2fdec1e71db3d37d097e07cdd5b210eaaa844bcf /src/verbs.cpp
parentExtensions: try to calculate the SVG unit (diff)
downloadinkscape-bad0504958a10f1b99db3ae2557305541f388a52.tar.gz
inkscape-bad0504958a10f1b99db3ae2557305541f388a52.zip
Units: make it absolutely clear that Document properties unit dropdown is for UI Display Units. Upon document load, calculate the units used for SVG values, if a viewbox is available. If not, default to "px" SVG units.
Change all code to use either Display units OR svg units. (bzr r13751)
Diffstat (limited to 'src/verbs.cpp')
-rw-r--r--src/verbs.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/verbs.cpp b/src/verbs.cpp
index b4743751e..33810fba2 100644
--- a/src/verbs.cpp
+++ b/src/verbs.cpp
@@ -1860,7 +1860,7 @@ void ZoomVerb::perform(SPAction *action, void *data)
double zcorr = 1.0;
Glib::ustring abbr = prefs->getString("/options/zoomcorrection/unit");
- if (dt->namedview->doc_units && dt->namedview->doc_units->abbr == abbr)
+ if (dt->namedview->display_units && (dt->namedview->display_units->abbr == abbr))
zcorr = prefs->getDouble("/options/zoomcorrection/value", 1.0);
Geom::Rect const d = dt->get_display_area();