diff options
| author | John Smith <john.smith7545@yahoo.com> | 2012-08-25 02:59:10 +0000 |
|---|---|---|
| committer | John Smith <john.smith7545@yahoo.com> | 2012-08-25 02:59:10 +0000 |
| commit | c21833d5e33044ec060dcc42da83a687712aa37f (patch) | |
| tree | 1222d7506700a824017c412339513b249fc552e8 /src | |
| parent | Add -headerpad_max_install_names to LDFLAGS when building for OSX .app (diff) | |
| download | inkscape-c21833d5e33044ec060dcc42da83a687712aa37f.tar.gz inkscape-c21833d5e33044ec060dcc42da83a687712aa37f.zip | |
Fix for 168164 : Default text output to px
(bzr r11621)
Diffstat (limited to 'src')
| -rw-r--r-- | src/style.cpp | 2 | ||||
| -rw-r--r-- | src/ui/dialog/inkscape-preferences.cpp | 2 | ||||
| -rw-r--r-- | src/ui/dialog/text-edit.cpp | 2 | ||||
| -rw-r--r-- | src/widgets/text-toolbar.cpp | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/src/style.cpp b/src/style.cpp index 1709132a0..ec03dcc7e 100644 --- a/src/style.cpp +++ b/src/style.cpp @@ -4233,7 +4233,7 @@ sp_style_write_ifontsize(gchar *p, gint const len, gchar const *key, Inkscape::CSSOStringStream os; Inkscape::Preferences *prefs = Inkscape::Preferences::get(); int unit = prefs->getInt("/options/font/unitType", SP_CSS_UNIT_PT); - if (prefs->getBool("/options/font/textOutputPx", false)) { + if (prefs->getBool("/options/font/textOutputPx", true)) { unit = SP_CSS_UNIT_PX; } os << key << ":" << sp_style_css_size_px_to_units(val->computed, unit) << sp_style_get_css_unit_string(unit) << ";"; diff --git a/src/ui/dialog/inkscape-preferences.cpp b/src/ui/dialog/inkscape-preferences.cpp index fd5fd9fe1..dc8913b8d 100644 --- a/src/ui/dialog/inkscape-preferences.cpp +++ b/src/ui/dialog/inkscape-preferences.cpp @@ -449,7 +449,7 @@ void InkscapePreferences::initPageTools() _font_unit_type.init( "/options/font/unitType", sizeLabels, sizeValues, G_N_ELEMENTS(sizeLabels), SP_CSS_UNIT_PT ); _page_text.add_line( false, _("Text size unit type:"), _font_unit_type, "", _("Set the type of unit used in the text toolbar and text dialogs"), false); - _font_output_px.init ( _("Always output text size in pixels (px)"), "/options/font/textOutputPx", false); + _font_output_px.init ( _("Always output text size in pixels (px)"), "/options/font/textOutputPx", true); _page_text.add_line( false, "", _font_output_px, "", _("Always convert the text size units above into pixels (px) before saving to file")); this->AddNewObjectsStyle(_page_text, "/tools/text"); diff --git a/src/ui/dialog/text-edit.cpp b/src/ui/dialog/text-edit.cpp index 0ea67b630..033571bb4 100644 --- a/src/ui/dialog/text-edit.cpp +++ b/src/ui/dialog/text-edit.cpp @@ -469,7 +469,7 @@ SPCSSAttr *TextEdit::getTextStyle () Inkscape::CSSOStringStream os; Inkscape::Preferences *prefs = Inkscape::Preferences::get(); int unit = prefs->getInt("/options/font/unitType", SP_CSS_UNIT_PT); - if (prefs->getBool("/options/font/textOutputPx", false)) { + if (prefs->getBool("/options/font/textOutputPx", true)) { os << sp_style_css_size_units_to_px(sp_font_selector_get_size (fsel), unit) << sp_style_get_css_unit_string(SP_CSS_UNIT_PX); } else { os << sp_font_selector_get_size (fsel) << sp_style_get_css_unit_string(unit); diff --git a/src/widgets/text-toolbar.cpp b/src/widgets/text-toolbar.cpp index fd7a549de..8c1219acc 100644 --- a/src/widgets/text-toolbar.cpp +++ b/src/widgets/text-toolbar.cpp @@ -448,7 +448,7 @@ static void sp_text_fontsize_value_changed( Ink_ComboBoxEntry_Action *act, GObje SPCSSAttr *css = sp_repr_css_attr_new (); Inkscape::CSSOStringStream osfs; int unit = prefs->getInt("/options/font/unitType", SP_CSS_UNIT_PT); - if (prefs->getBool("/options/font/textOutputPx", false)) { + if (prefs->getBool("/options/font/textOutputPx", true)) { osfs << sp_style_css_size_units_to_px(size, unit) << sp_style_get_css_unit_string(SP_CSS_UNIT_PX); } else { osfs << size << sp_style_get_css_unit_string(unit); |