Commit 8f526a5d authored by Matthias Clasen's avatar Matthias Clasen Committed by Matthias Clasen
Browse files

Fix label alignment when width-chars is set. (#326098, Benjamin Otte)

2006-01-08  Matthias Clasen  <mclasen@redhat.com>

	* gtk/gtklabel.c (get_layout_location): Fix label alignment
	when width-chars is set.  (#326098, Benjamin Otte)
parent ea8167d9
2006-01-08 Matthias Clasen <mclasen@redhat.com>
* gtk/gtklabel.c (get_layout_location): Fix label alignment
when width-chars is set. (#326098, Benjamin Otte)
* gdk/gdkregion-generic.c (miRegionCopy): Fix this for the
single-rectangle case. (#326127, Benjamin Berg)
(gdk_region_copy): Use miRegionCopy() here.
......
2006-01-08 Matthias Clasen <mclasen@redhat.com>
* gtk/gtklabel.c (get_layout_location): Fix label alignment
when width-chars is set. (#326098, Benjamin Otte)
* gdk/gdkregion-generic.c (miRegionCopy): Fix this for the
single-rectangle case. (#326127, Benjamin Berg)
(gdk_region_copy): Use miRegionCopy() here.
......
......@@ -2191,19 +2191,21 @@ get_layout_location (GtkLabel *label,
gint *yp)
{
GtkMisc *misc;
GtkWidget *widget;
GtkWidget *widget;
GtkLabelPrivate *priv;
gfloat xalign;
gint req_width, x, y;
misc = GTK_MISC (label);
widget = GTK_WIDGET (label);
priv = GTK_LABEL_GET_PRIVATE (label);
if (gtk_widget_get_direction (widget) == GTK_TEXT_DIR_LTR)
xalign = misc->xalign;
else
xalign = 1.0 - misc->xalign;
if (label->ellipsize)
if (label->ellipsize || priv->width_chars > 0)
{
PangoRectangle ink_rect;
......
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