diff options
| author | Tavmjong Bah <tavmjong@free.fr> | 2019-10-03 08:36:15 +0000 |
|---|---|---|
| committer | Tavmjong Bah <tavmjong@free.fr> | 2019-10-03 08:36:15 +0000 |
| commit | 1b0ccd4b74a828426696cb1f7e11d1505e7446cd (patch) | |
| tree | 0710d420215afa7197fa514672c8f1455a9aa8f5 /src | |
| parent | Fix SVG in OpenType decoding bug. (diff) | |
| download | inkscape-1b0ccd4b74a828426696cb1f7e11d1505e7446cd.tar.gz inkscape-1b0ccd4b74a828426696cb1f7e11d1505e7446cd.zip | |
Show glyphs using selected font in Glyphs dialog.
Changed due to Maren's comment in https://gitlab.com/inkscape/inkscape/issues/436
Diffstat (limited to 'src')
| -rw-r--r-- | src/ui/dialog/glyphs.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/ui/dialog/glyphs.cpp b/src/ui/dialog/glyphs.cpp index 6702d9357..1706aad1c 100644 --- a/src/ui/dialog/glyphs.cpp +++ b/src/ui/dialog/glyphs.cpp @@ -13,6 +13,7 @@ #include "glyphs.h" #include <glibmm/i18n.h> +#include <glibmm/markup.h> #include <gtkmm/comboboxtext.h> #include <gtkmm/grid.h> #include <gtkmm/iconview.h> @@ -404,7 +405,7 @@ GlyphsPanel::GlyphsPanel() : GlyphColumns *columns = getColumns(); iconView = new Gtk::IconView(static_cast<Glib::RefPtr<Gtk::TreeModel> >(store)); - iconView->set_text_column(columns->name); + iconView->set_markup_column(columns->name); iconView->set_tooltip_column(2); // Uses Pango merkup, must use column number. //iconView->set_columns(16); @@ -695,9 +696,10 @@ void GlyphsPanel::rebuild() Gtk::ListStore::iterator row = store->append(); Glib::ustring tmp; tmp += it; + tmp = Glib::Markup::escape_text(tmp); // Escape '&', '<', etc. (*row)[columns->code] = it; - (*row)[columns->name] = tmp; - (*row)[columns->tooltip] = "<span font_desc=\"" + fontspec + "\" size=\"32000\">" + tmp + "</span>"; + (*row)[columns->name] = "<span font_desc=\"" + fontspec + "\">" + tmp + "</span>"; + (*row)[columns->tooltip] = "<span font_desc=\"" + fontspec + "\" size=\"42000\">" + tmp + "</span>"; } // Reconnect the model once it has been updated: |