summaryrefslogtreecommitdiffstats
path: root/src/ui/widget/font-selector.cpp
diff options
context:
space:
mode:
authorTavmjong Bah <tavmjong@free.fr>2018-04-14 18:44:15 +0000
committerTavmjong Bah <tavmjong@free.fr>2018-04-14 18:44:15 +0000
commite7c4526a1f7ed8cd3e1f2fbc9f5a78f5475ab8a8 (patch)
tree3b92ee66edcb2bc78d627d2aabd6b6b3e5334297 /src/ui/widget/font-selector.cpp
parentFixes to transforms on LPE (diff)
downloadinkscape-e7c4526a1f7ed8cd3e1f2fbc9f5a78f5475ab8a8.tar.gz
inkscape-e7c4526a1f7ed8cd3e1f2fbc9f5a78f5475ab8a8.zip
Fix a couple of buglets in Font Selector widget...
Use designer face name rather than CSS face name in second style column. Add label for second style column.
Diffstat (limited to 'src/ui/widget/font-selector.cpp')
-rw-r--r--src/ui/widget/font-selector.cpp5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/ui/widget/font-selector.cpp b/src/ui/widget/font-selector.cpp
index 3e535aee4..5873802d5 100644
--- a/src/ui/widget/font-selector.cpp
+++ b/src/ui/widget/font-selector.cpp
@@ -61,13 +61,12 @@ FontSelector::FontSelector (bool with_size)
// Style
style_treecolumn.pack_start (style_cell, false);
style_treecolumn.add_attribute (style_cell, "text", 0);
- //style_treecolumn.set_cell_data_func (style_cell, &font_lister_style_cell_data_func);
style_treecolumn.set_cell_data_func (style_cell, sigc::mem_fun(*this, &FontSelector::style_cell_data_func));
+ style_treecolumn.set_title ("Face");
style_treeview.set_model (font_lister->get_style_list());
style_treeview.set_name ("FontSelector: Style");
style_treeview.append_column ("CSS", font_lister->FontStyleList.cssStyle);
- //style_treeview.append_column ("Face",font_lister->FontStyleList.displayStyle);
style_treeview.append_column (style_treecolumn);
style_scroll.set_policy (Gtk::POLICY_NEVER, Gtk::POLICY_AUTOMATIC);
@@ -243,7 +242,7 @@ FontSelector::style_cell_data_func (Gtk::CellRenderer *renderer, Gtk::TreeIter c
}
Glib::ustring style = "Normal";
- (*iter).get_value(0, style);
+ (*iter).get_value(1, style);
Glib::ustring style_escaped = Glib::strescape( style );
Glib::ustring font_desc = family + ", " + style;