summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorTavmjong Bah <tavmjong@free.fr>2014-11-26 19:23:03 +0000
committertavmjong-free <tavmjong@free.fr>2014-11-26 19:23:03 +0000
commit970401eaa2de197733cadc350848dc5cd4c007a5 (patch)
treef4ce4c0ae3730b07fb0edb8c5e4df3abfd798511 /src
parentDutch translation update (diff)
downloadinkscape-970401eaa2de197733cadc350848dc5cd4c007a5.tar.gz
inkscape-970401eaa2de197733cadc350848dc5cd4c007a5.zip
Change default display unit to 'px'.
(bzr r13773)
Diffstat (limited to 'src')
-rw-r--r--src/document.cpp2
-rw-r--r--src/sp-namedview.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/document.cpp b/src/document.cpp
index 2625ef8fc..84ec1eda3 100644
--- a/src/document.cpp
+++ b/src/document.cpp
@@ -599,7 +599,7 @@ SPDocument *SPDocument::doUnref()
Inkscape::Util::Unit const* SPDocument::getDefaultUnit() const
{
SPNamedView const* nv = sp_document_namedview(this, NULL);
- return nv ? nv->getDefaultUnit() : unit_table.getUnit("pt");
+ return nv ? nv->getDefaultUnit() : unit_table.getUnit("px");
}
/// guaranteed not to return nullptr
diff --git a/src/sp-namedview.cpp b/src/sp-namedview.cpp
index 09d383e3c..c505186e9 100644
--- a/src/sp-namedview.cpp
+++ b/src/sp-namedview.cpp
@@ -1134,7 +1134,7 @@ double SPNamedView::getMarginLength(gchar const * const key,
*/
Inkscape::Util::Unit const * SPNamedView::getDefaultUnit() const
{
- return display_units ? display_units : unit_table.getUnit("pt");
+ return display_units ? display_units : unit_table.getUnit("px");
}
Inkscape::Util::Unit const & SPNamedView::getSVGUnit() const