From 8f526a5dc9eb33e10c228551fccdc545d1948854 Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@redhat.com>
Date: Sun, 8 Jan 2006 06:44:11 +0000
Subject: 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)
---
 gtk/gtklabel.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'gtk/gtklabel.c')

diff --git a/gtk/gtklabel.c b/gtk/gtklabel.c
index 269d859767..2c5509c311 100644
--- a/gtk/gtklabel.c
+++ b/gtk/gtklabel.c
@@ -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;
 
-- 
cgit v1.2.1