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

label: Add another special case for measuring

Browse Source
This commit is contained in:
Benjamin Otte 2011-03-29 13:33:47 +02:00
parent 9992efdb0e
commit 21f117c695
1 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
gtk/gtklabel.c
View File

@ -3066,6 +3066,17 @@ gtk_label_get_measuring_layout (GtkLabel * label,
return priv->layout; return priv->layout;
} }
/* We can use the label's own layout if we're not allocated a size yet,
* because we don't need it to be properly setup at that point.
* This way we can make use of caching upon the label's creation.
*/
if (gtk_widget_get_allocated_width (GTK_WIDGET (label)) <= 1)
{
g_object_ref (priv->layout);
pango_layout_set_width (priv->layout, width);
return priv->layout;
}
/* oftentimes we want to measure a width that is far wider than the current width, /* oftentimes we want to measure a width that is far wider than the current width,
* even though the layout is not wrapped. In that case, we can just return the * even though the layout is not wrapped. In that case, we can just return the
* current layout, because for measuring purposes, it will be identical. * current layout, because for measuring purposes, it will be identical.