From a5bd1474d5bb3373320c2984e7aa8e61f19fd405 Mon Sep 17 00:00:00 2001 From: Cosimo Cecchi Date: Fri, 11 Apr 2014 12:13:11 -0700 Subject: [PATCH] entry: consider ascent and descent when requesting height Commit d05191a010bcd9871b0155a785989192967c692b change the height requisition to be completely dependent on the PangoLayout, but that breaks when the font has special characters with different metrics. Use the maximum between the two instead. https://bugzilla.gnome.org/show_bug.cgi?id=728054 --- gtk/gtkentry.c | 1 + 1 file changed, 1 insertion(+) diff --git a/gtk/gtkentry.c b/gtk/gtkentry.c index dc9756fe98..3fd19397c8 100644 --- a/gtk/gtkentry.c +++ b/gtk/gtkentry.c @@ -3452,6 +3452,7 @@ gtk_entry_get_preferred_height_and_baseline_for_width (GtkWidget *widget, _gtk_entry_get_borders (entry, &borders); pango_layout_get_pixel_size (layout, NULL, &height); + height = MAX (height, PANGO_PIXELS (priv->ascent + priv->descent)); height += borders.top + borders.bottom; baseline = pango_layout_get_baseline (layout) / PANGO_SCALE;