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

font chooser: Align property defaults

Browse Source 
Set the default font chooser level to the same value we use
in the backports, to preserve font chooser behavior.
This commit is contained in:
Matthias Clasen 2018-03-31 20:59:35 -04:00
parent 8fb30a6a7b
commit 17693a2820
2 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gtk/gtkfontbutton.c
View File

@ -608,8 +608,7 @@ gtk_font_button_init (GtkFontButton *font_button)
font_button->priv->title = g_strdup (_("Pick a Font"));
font_button->priv->level = GTK_FONT_CHOOSER_LEVEL_FAMILY |
GTK_FONT_CHOOSER_LEVEL_STYLE |
GTK_FONT_CHOOSER_LEVEL_SIZE |
GTK_FONT_CHOOSER_LEVEL_VARIATION;
GTK_FONT_CHOOSER_LEVEL_SIZE;
gtk_font_button_take_font_desc (font_button, NULL);
@ -1196,7 +1195,6 @@ pango_font_description_to_css (PangoFontDescription *desc,
g_string_append (s, "font-stretch: expanded; ");
break;
case PANGO_STRETCH_EXTRA_EXPANDED:
g_string_append (s, "font-stretch: extra-expanded; ");
break;
case PANGO_STRETCH_ULTRA_EXPANDED:
g_string_append (s, "font-stretch: ultra-expanded; ");

3
gtk/gtkfontchooser.c
View File

@ -118,8 +118,7 @@ gtk_font_chooser_default_init (GtkFontChooserInterface *iface)
GTK_TYPE_FONT_CHOOSER_LEVEL,
GTK_FONT_CHOOSER_LEVEL_FAMILY |
GTK_FONT_CHOOSER_LEVEL_STYLE |
GTK_FONT_CHOOSER_LEVEL_SIZE |
GTK_FONT_CHOOSER_LEVEL_VARIATION,
GTK_FONT_CHOOSER_LEVEL_SIZE,
GTK_PARAM_READWRITE|G_PARAM_EXPLICIT_NOTIFY));
/**