Commit 2990e0d7 authored by Behdad Esfahbod's avatar Behdad Esfahbod Committed by Behdad Esfahbod
Browse files

Use logical extents of the layout instead of ink extents. According to

2006-01-25  Behdad Esfahbod  <behdad@gnome.org>

        * gtk/gtklabel.c (get_layout_location): Use logical extents of the
        layout instead of ink extents.  According to Pango docs, that's what
        should be used for placement.  Moreover, simply use
        pango_layout_get_pixel_size instead of getting the extents and
        dividing ourselves.
parent 2ec7ee28
2006-01-25 Behdad Esfahbod <behdad@gnome.org>
* gtk/gtklabel.c (get_layout_location): Use logical extents of the
layout instead of ink extents. According to Pango docs, that's what
should be used for placement. Moreover, simply use
pango_layout_get_pixel_size instead of getting the extents and
dividing ourselves.
2006-01-25 Matthias Clasen <mclasen@redhat.com>
* gdk/x11/gdkcursor-x11.c (gdk_x11_display_set_cursor_theme): Only
......
2006-01-25 Behdad Esfahbod <behdad@gnome.org>
* gtk/gtklabel.c (get_layout_location): Use logical extents of the
layout instead of ink extents. According to Pango docs, that's what
should be used for placement. Moreover, simply use
pango_layout_get_pixel_size instead of getting the extents and
dividing ourselves.
2006-01-25 Matthias Clasen <mclasen@redhat.com>
* gdk/x11/gdkcursor-x11.c (gdk_x11_display_set_cursor_theme): Only
......
......@@ -2221,18 +2221,12 @@ get_layout_location (GtkLabel *label,
if (label->ellipsize || priv->width_chars > 0)
{
int width;
PangoRectangle ink_rect;
width = pango_layout_get_width (label->layout);
if (width == -1)
{
pango_layout_get_extents (label->layout, &ink_rect, NULL);
req_width = PANGO_PIXELS (ink_rect.width);
}
pango_layout_get_pixel_size (label->layout, &req_width, NULL);
else
{
req_width = PANGO_PIXELS (width);
}
req_width = PANGO_PIXELS (width);
}
else
req_width = widget->requisition.width;
......
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