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

label: Compute label baselines correctly

Browse Source 
When we were switching smallest and widest, we were not switching the
baselines.
This commit is contained in:
Benjamin Otte 2019-12-08 05:32:35 +01:00
parent 9f6d12551f
commit 503d988c1b
1 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
gtk/gtklabel.c
View File

@ -3630,14 +3630,24 @@ gtk_label_get_preferred_size (GtkWidget *widget,
} }
else /* GTK_ORIENTATION_VERTICAL */ else /* GTK_ORIENTATION_VERTICAL */
{ {
*minimum_size = MIN (smallest_rect.height, widest_rect.height); if (smallest_rect.height < widest_rect.height)
*natural_size = MAX (smallest_rect.height, widest_rect.height); {
*minimum_size = smallest_rect.height;
if (minimum_baseline) *natural_size = widest_rect.height;
*minimum_baseline = smallest_baseline; if (minimum_baseline)
*minimum_baseline = smallest_baseline;
if (natural_baseline) if (natural_baseline)
*natural_baseline = widest_baseline; *natural_baseline = widest_baseline;
}
else
{
*minimum_size = widest_rect.height;
*natural_size = smallest_rect.height;
if (minimum_baseline)
*minimum_baseline = widest_baseline;
if (natural_baseline)
*natural_baseline = smallest_baseline;
}
} }
} }