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

label: Don't do more work than necessary

Browse Source 
We only want to determine the size pixel-exact, not pango-unit-exact, so
don't spend lots of time wondering if text is half a pixel or a quarter
pixel wider.
This commit is contained in:
Benjamin Otte 2021-11-11 05:21:43 +01:00
parent b4c2d1dabb
commit 7f7809f523
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
gtk/gtklabel.c
View File

@ -1191,11 +1191,14 @@ get_width_for_height (GtkLabel *self,
layout = gtk_label_get_measuring_layout (self, NULL, -1);
pango_layout_get_size (layout, &max, NULL);
min = PANGO_PIXELS_CEIL (min);
max = PANGO_PIXELS_CEIL (max);
while (min < max)
{
mid = (min + max) / 2;
layout = gtk_label_get_measuring_layout (self, layout, mid);
layout = gtk_label_get_measuring_layout (self, layout, mid * PANGO_SCALE);
pango_layout_get_size (layout, &text_width, &text_height);
text_width = PANGO_PIXELS_CEIL (text_width);
if (text_width > mid)
min = mid = text_width;
if (text_height > height)
@ -1204,8 +1207,8 @@ get_width_for_height (GtkLabel *self,
max = mid;
}
*minimum_width = min;
*natural_width = min;
*minimum_width = min * PANGO_SCALE;
*natural_width = min * PANGO_SCALE;
}
g_object_unref (layout);