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

label: Provide a baseline in all cases

Browse Source 
The label measuring code was only determining baselines
when the label was set to wrap, which does not seem right.
Non-wrapping labels have a meaningful baseline as well,
report it back.
This commit is contained in:
Matthias Clasen 2017-06-11 10:35:06 -04:00
parent 114f23cec7
commit 77f34d01ad
1 changed files with 25 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
gtk/gtklabel.c
View File

@ -3512,7 +3512,9 @@ get_char_pixels (GtkWidget *label,
static void
gtk_label_get_preferred_layout_size (GtkLabel *label,
PangoRectangle *smallest,
PangoRectangle *widest)
PangoRectangle *widest,
int *smallest_baseline,
int *widest_baseline)
{
GtkLabelPrivate *priv = label->priv;
PangoLayout *layout;
@ -3541,10 +3543,11 @@ gtk_label_get_preferred_layout_size (GtkLabel *label,
char_pixels = get_char_pixels (GTK_WIDGET (label), layout);
else
char_pixels = 0;
pango_layout_get_extents (layout, NULL, widest);
widest->width = MAX (widest->width, char_pixels * priv->width_chars);
widest->x = widest->y = 0;
*widest_baseline = pango_layout_get_baseline (layout) / PANGO_SCALE;
if (priv->ellipsize || priv->wrap)
{
@ -3558,6 +3561,8 @@ gtk_label_get_preferred_layout_size (GtkLabel *label,
smallest->width = MAX (smallest->width, char_pixels * priv->width_chars);
smallest->x = smallest->y = 0;
*smallest_baseline = pango_layout_get_baseline (layout) / PANGO_SCALE;
if (priv->max_width_chars > -1 && widest->width > char_pixels * priv->max_width_chars)
{
layout = gtk_label_get_measuring_layout (label,
@ -3566,14 +3571,20 @@ gtk_label_get_preferred_layout_size (GtkLabel *label,
pango_layout_get_extents (layout, NULL, widest);
widest->width = MAX (widest->width, char_pixels * priv->width_chars);
widest->x = widest->y = 0;
*widest_baseline = pango_layout_get_baseline (layout) / PANGO_SCALE;
}
if (widest->width < smallest->width)
*smallest = *widest;
{
*smallest = *widest;
*smallest_baseline = *widest_baseline;
}
}
else
{
*smallest = *widest;
*smallest_baseline = *widest_baseline;
}
g_object_unref (layout);
@ -3590,8 +3601,12 @@ gtk_label_get_preferred_size (GtkWidget *widget,
GtkLabel *label = GTK_LABEL (widget);
PangoRectangle widest_rect;
PangoRectangle smallest_rect;
int smallest_baseline;
int widest_baseline;
gtk_label_get_preferred_layout_size (label, &smallest_rect, &widest_rect);
gtk_label_get_preferred_layout_size (label,
&smallest_rect, &widest_rect,
&smallest_baseline, &widest_baseline);
widest_rect.width = PANGO_PIXELS_CEIL (widest_rect.width);
widest_rect.height = PANGO_PIXELS_CEIL (widest_rect.height);
@ -3615,6 +3630,12 @@ gtk_label_get_preferred_size (GtkWidget *widget,
{
*minimum_size = MIN (smallest_rect.height, widest_rect.height);
*natural_size = MAX (smallest_rect.height, widest_rect.height);
if (minimum_baseline)
*minimum_baseline = smallest_baseline;
if (natural_baseline)
*natural_baseline = widest_baseline;
}
}