From 42edcf8a77bcab2d4ce1db7c0400c8f00acbb918 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Sun, 8 Jan 2006 06:45:57 +0000 Subject: [PATCH] Fix label alignment when width-chars is set. (#326098, Benjamin Otte) 2006-01-08 Matthias Clasen * gtk/gtklabel.c (get_layout_location): Fix label alignment when width-chars is set. (#326098, Benjamin Otte) --- ChangeLog | 5 +++++ ChangeLog.pre-2-10 | 5 +++++ gtk/gtklabel.c | 4 +++- 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index a559933581..9a1cba2859 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2006-01-08 Matthias Clasen + + * gtk/gtklabel.c (get_layout_location): Fix label alignment + when width-chars is set. (#326098, Benjamin Otte) + 2006-01-06 Matthias Clasen * gtk/gtkactiongroup.c (gtk_action_group_set_sensitive) diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index a559933581..9a1cba2859 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +2006-01-08 Matthias Clasen + + * gtk/gtklabel.c (get_layout_location): Fix label alignment + when width-chars is set. (#326098, Benjamin Otte) + 2006-01-06 Matthias Clasen * gtk/gtkactiongroup.c (gtk_action_group_set_sensitive) diff --git a/gtk/gtklabel.c b/gtk/gtklabel.c index 460285a0be..d58cd4d8d6 100644 --- a/gtk/gtklabel.c +++ b/gtk/gtklabel.c @@ -2155,18 +2155,20 @@ get_layout_location (GtkLabel *label, { GtkMisc *misc; 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;