diff options
| author | Tavmjong Bah <tavmjong@free.fr> | 2018-04-26 08:42:21 +0000 |
|---|---|---|
| committer | Tavmjong Bah <tavmjong@free.fr> | 2018-04-26 08:42:21 +0000 |
| commit | 8d6e6db37f2fb58d4f3cfe8ca2827c0c4ae6c006 (patch) | |
| tree | 5d1b0110905cef04cc1078378d05011558c72389 /src/ui/dialog | |
| parent | CMake: put policies at the top before running any other code (diff) | |
| download | inkscape-8d6e6db37f2fb58d4f3cfe8ca2827c0c4ae6c006.tar.gz inkscape-8d6e6db37f2fb58d4f3cfe8ca2827c0c4ae6c006.zip | |
Add start of 'font-variations' widget.
Some code cleanup.
Diffstat (limited to 'src/ui/dialog')
| -rw-r--r-- | src/ui/dialog/text-edit.cpp | 3 | ||||
| -rw-r--r-- | src/ui/dialog/text-edit.h | 2 |
2 files changed, 5 insertions, 0 deletions
diff --git a/src/ui/dialog/text-edit.cpp b/src/ui/dialog/text-edit.cpp index d283e6549..430d2c114 100644 --- a/src/ui/dialog/text-edit.cpp +++ b/src/ui/dialog/text-edit.cpp @@ -94,8 +94,10 @@ TextEdit::TextEdit() preview_label.set_line_wrap (false); font_vbox.pack_start(font_selector, true, true); + font_vbox.pack_start(font_variations, false, false); font_vbox.pack_start(preview_label, false, false, 5); + /* Text tab -------------------------------- */ scroller.set_policy( Gtk::POLICY_AUTOMATIC, Gtk::POLICY_AUTOMATIC ); scroller.set_shadow_type(Gtk::SHADOW_IN); @@ -268,6 +270,7 @@ void TextEdit::onReadSelection ( gboolean dostyle, gboolean /*docontent*/ ) int result_features = sp_desktop_query_style (SP_ACTIVE_DESKTOP, &query, QUERY_STYLE_PROPERTY_FONTFEATURESETTINGS); vari_vbox.update( &query, result_features == QUERY_STYLE_MULTIPLE_DIFFERENT, fontspec ); + font_variations.update ( query, result_features == QUERY_STYLE_MULTIPLE_DIFFERENT, fontspec ); } blocked = false; diff --git a/src/ui/dialog/text-edit.h b/src/ui/dialog/text-edit.h index e891c8e42..43b3b281d 100644 --- a/src/ui/dialog/text-edit.h +++ b/src/ui/dialog/text-edit.h @@ -33,6 +33,7 @@ #include "ui/widget/font-selector.h" #include "ui/widget/font-variants.h" +#include "ui/widget/font-variations.h" class SPItem; struct SPFontSelector; @@ -165,6 +166,7 @@ private: Gtk::Label font_label; Inkscape::UI::Widget::FontSelector font_selector; + Inkscape::UI::Widget::FontVariations font_variations; Gtk::Label preview_label; // Share with variants tab? // Tab 2: Text ---------------------- // |