Commit e4dc23c4 authored by Behdad Esfahbod's avatar Behdad Esfahbod Committed by Behdad Esfahbod

Fix broken width computation, again.

2007-01-05  Behdad Esfahbod  <behdad@gnome.org>

        * gtk/gtklabel.c (get_layout_location): Fix broken width computation,
        again.


svn path=/trunk/; revision=17083
parent 34039c70
2007-01-05 Behdad Esfahbod <behdad@gnome.org>
* gtk/gtklabel.c (get_layout_location): Fix broken width computation,
again.
2007-01-05 Carlos Garnacho <carlosg@gnome.org>
* gtk/gtknotebook.c (gtk_notebook_size_request): take into account
......
......@@ -2301,8 +2301,9 @@ get_layout_location (GtkLabel *label,
width = pango_layout_get_width (label->layout);
pango_layout_get_pixel_extents (label->layout, NULL, &logical);
/* width may be -1 */
req_width = MIN(PANGO_PIXELS (width), logical.width);
req_width = logical.width;
if (width != -1)
req_width = MIN(PANGO_PIXELS (width), req_width);
req_width += 2 * misc->xpad;
}
else
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment