summaryrefslogtreecommitdiffstats
path: root/src/widgets/text-toolbar.cpp
diff options
context:
space:
mode:
authorTavmjong Bah <tavmjong@free.fr>2014-04-22 14:37:22 +0000
committertavmjong-free <tavmjong@free.fr>2014-04-22 14:37:22 +0000
commitcd13c979453864482930c496f7c4c4d2da891a7a (patch)
treead6082ba7061fb9ab324fa7f8374fe2da4e4886c /src/widgets/text-toolbar.cpp
parentensure backwards compatibility with old hpgl exports (diff)
downloadinkscape-cd13c979453864482930c496f7c4c4d2da891a7a.tar.gz
inkscape-cd13c979453864482930c496f7c4c4d2da891a7a.zip
Restore ability to insert a font-family that is not on system or a font-fallback list.
(bzr r13296)
Diffstat (limited to 'src/widgets/text-toolbar.cpp')
-rw-r--r--src/widgets/text-toolbar.cpp7
1 files changed, 7 insertions, 0 deletions
diff --git a/src/widgets/text-toolbar.cpp b/src/widgets/text-toolbar.cpp
index 349fefa12..7b59fa633 100644
--- a/src/widgets/text-toolbar.cpp
+++ b/src/widgets/text-toolbar.cpp
@@ -146,6 +146,13 @@ static void sp_text_fontfamily_value_changed( Ink_ComboBoxEntry_Action *act, GOb
std::cout << " New active: " << act->active << std::endl;
#endif
if( new_family.compare( fontlister->get_font_family() ) != 0 ) {
+ // Changed font-family
+
+ if( act->active == -1 ) {
+ // New font-family, not in document, not on system (could be fallback list)
+ fontlister->insert_font_family( new_family );
+ act->active = 0; // New family is always at top of list.
+ }
std::pair<Glib::ustring,Glib::ustring> ui = fontlister->set_font_family( act->active );
// active text set in sp_text_toolbox_selection_changed()