AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

font chooser: Don't set hardcoded default features

Browse Source 
We should rely on harfbuzz to select the right defaults.
This commit is contained in:
Matthias Clasen 2018-01-03 13:41:20 -05:00
parent 4cc68a97a8
commit 7687393583
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gtk/gtkfontchooserwidget.c
View File

@ -2087,7 +2087,7 @@ update_font_features (GtkFontChooserWidget *fontchooser)
GString *s; GString *s;
GList *l; GList *l;
s = g_string_new ("\"kern\" 1, \"curs\" 1, \"lfbd\" 1, \"rfbd\" 1, \"mark\" 1, \"mkmk\" 1, \"mset\" 1, \"ccmp\" 1, \"rlig\" 1, \"rclt\" 1, \"rvrn\" 1"); s = g_string_new ("");
for (l = priv->feature_items; l; l = l->next) for (l = priv->feature_items; l; l = l->next)
{ {
@ -2101,7 +2101,9 @@ update_font_features (GtkFontChooserWidget *fontchooser)
if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (item->feat)) && if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (item->feat)) &&
strcmp (item->name, "xxxx") != 0) strcmp (item->name, "xxxx") != 0)
{ {
g_string_append (s, ", \""); if (s->len > 0)
g_string_append (s, ", ");
g_string_append (s, "\"");
g_string_append (s, item->name); g_string_append (s, item->name);
g_string_append (s, "\" 1"); g_string_append (s, "\" 1");
} }
@ -2111,6 +2113,8 @@ update_font_features (GtkFontChooserWidget *fontchooser)
if (gtk_check_button_get_inconsistent (GTK_CHECK_BUTTON (item->feat))) if (gtk_check_button_get_inconsistent (GTK_CHECK_BUTTON (item->feat)))
continue; continue;
if (s->len > 0)
g_string_append (s, ", ");
g_string_append (s, ", \""); g_string_append (s, ", \"");
g_string_append (s, item->name); g_string_append (s, item->name);
if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (item->feat))) if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (item->feat)))