diff options
Diffstat (limited to 'gtk/gtkfontsel.c')
| -rw-r--r-- | gtk/gtkfontsel.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/gtk/gtkfontsel.c b/gtk/gtkfontsel.c index 5353fb9dea..0d66568076 100644 --- a/gtk/gtkfontsel.c +++ b/gtk/gtkfontsel.c @@ -1150,17 +1150,18 @@ gtk_font_selection_get_font_description (GtkFontSelection *fontsel) return font_desc; } -/* This sets the font in the preview entry to the selected font, and tries to - make sure that the preview entry is a reasonable size, i.e. so that the - text can be seen with a bit of space to spare. But it tries to avoid - resizing the entry every time the font changes. - This also used to shrink the preview if the font size was decreased, but - that made it awkward if the user wanted to resize the window themself. */ +/* This sets the font in the preview entry to the selected font, + * and tries to make sure that the preview entry is a reasonable + * size, i.e. so that the text can be seen with a bit of space to + * spare. But it tries to avoid resizing the entry every time the + * font changes. This also used to shrink the preview if the font + * size was decreased, but that made it awkward if the user wanted + * to resize the window themself. + */ static void gtk_font_selection_update_preview (GtkFontSelection *fontsel) { GtkFontSelectionPrivate *priv = fontsel->priv; - GtkStyleContext *context; gint new_height; GtkRequisition old_requisition, new_requisition; GtkWidget *preview_entry = priv->preview_entry; @@ -1168,18 +1169,17 @@ gtk_font_selection_update_preview (GtkFontSelection *fontsel) gtk_widget_get_preferred_size (preview_entry, &old_requisition, NULL); - context = gtk_widget_get_style_context (preview_entry); gtk_widget_override_font (preview_entry, gtk_font_selection_get_font_description (fontsel)); gtk_widget_get_preferred_size (preview_entry, &new_requisition, NULL); - + /* We don't ever want to be over MAX_PREVIEW_HEIGHT pixels high. */ new_height = CLAMP (new_requisition.height, INITIAL_PREVIEW_HEIGHT, MAX_PREVIEW_HEIGHT); if (new_height > old_requisition.height || new_height < old_requisition.height - 30) gtk_widget_set_size_request (preview_entry, -1, new_height); - + /* This sets the preview text, if it hasn't been set already. */ text = gtk_entry_get_text (GTK_ENTRY (preview_entry)); if (strlen (text) == 0) |