diff options
| author | Jabier Arraiza Cenoz <jabier.arraiza@marker.es> | 2014-04-22 16:51:46 +0000 |
|---|---|---|
| committer | Jabiertxof <jtx@jtx.marker.es> | 2014-04-22 16:51:46 +0000 |
| commit | 3ba6a439421cf71986547d9588a5c0bf5bd7a8e7 (patch) | |
| tree | 6e5260ec5ab6d754d032701910918ca746d88807 /src/widgets | |
| parent | update to trunk (diff) | |
| parent | Parse xml:lang, required for SVG (CSS uses lang) (diff) | |
| download | inkscape-3ba6a439421cf71986547d9588a5c0bf5bd7a8e7.tar.gz inkscape-3ba6a439421cf71986547d9588a5c0bf5bd7a8e7.zip | |
update to trunk
(bzr r11950.1.333)
Diffstat (limited to 'src/widgets')
| -rw-r--r-- | src/widgets/text-toolbar.cpp | 7 |
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() |