summaryrefslogtreecommitdiffstats
path: root/src/ui/toolbar/text-toolbar.cpp
diff options
context:
space:
mode:
authorNathan Lee <2431820-nathanal@users.noreply.gitlab.com>2019-06-08 07:44:51 +0000
committerPatrick Storz <eduard.braun2@gmx.de>2019-06-08 12:19:53 +0000
commit3ee898118ef4a0b7df203c59bd872d9df2158d93 (patch)
tree78c24fdfb2a393e032bcf6aeb27197cc2cd10511 /src/ui/toolbar/text-toolbar.cpp
parentUpdate it.po (diff)
downloadinkscape-3ee898118ef4a0b7df203c59bd872d9df2158d93.tar.gz
inkscape-3ee898118ef4a0b7df203c59bd872d9df2158d93.zip
Stop crash when Text > Outermost element is active
Fix https://gitlab.com/inkscape/inkscape/issues/289
Diffstat (limited to 'src/ui/toolbar/text-toolbar.cpp')
-rw-r--r--src/ui/toolbar/text-toolbar.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/ui/toolbar/text-toolbar.cpp b/src/ui/toolbar/text-toolbar.cpp
index a8604778a..b191385df 100644
--- a/src/ui/toolbar/text-toolbar.cpp
+++ b/src/ui/toolbar/text-toolbar.cpp
@@ -347,7 +347,7 @@ TextToolbar::TextToolbar(SPDesktop *desktop)
_outer_style_item->set_icon_name(INKSCAPE_ICON("text_outer_style"));
add(*_outer_style_item);
_outer_style_item->signal_toggled().connect(sigc::mem_fun(*this, &TextToolbar::outer_style_changed));
- _outer_style_item->set_active(prefs->getBool("/tools/text/outer_style", false));
+ // need to set_active status *after* a bunch of other widgets. See end of this function.
}
/* Font size */
@@ -736,6 +736,9 @@ TextToolbar::TextToolbar(SPDesktop *desktop)
_direction_item->signal_changed_after().connect(sigc::mem_fun(*this, &TextToolbar::direction_changed));
}
+ // Text outer style (continued)
+ _outer_style_item->set_active(prefs->getBool("/tools/text/outer_style", false));
+
show_all();
// Is this necessary to call? Shouldn't hurt.