callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix preview sizing in GtkFontSelection

Browse Source 
The code that was trying to limit preview size changes was
running into some width-for-height pitfalls. It turns out
that the dialog behaves quite ok without this code, so just
remove it.
This commit is contained in:
Matthias Clasen
2012-07-15 11:45:21 -04:00
parent bb315af546
commit cc310be81a
1 changed files with 1 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
gtk/deprecated/gtkfontsel.c
View File

@ -1184,36 +1184,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.
*/
static void
gtk_font_selection_update_preview (GtkFontSelection *fontsel)
{
GtkFontSelectionPrivate *priv = fontsel->priv;
gint new_height;
GtkRequisition old_requisition, new_requisition;
GtkWidget *preview_entry = priv->preview_entry;
const gchar *text;
gtk_widget_get_preferred_size (preview_entry, &old_requisition, NULL);
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)