summaryrefslogtreecommitdiff
path: root/gtk/gtklabel.c
diff options
context:
space:
mode:
authorMatthias Clasen <mclasen@redhat.com>2006-01-08 06:44:11 +0000
committerMatthias Clasen <matthiasc@src.gnome.org>2006-01-08 06:44:11 +0000
commit8f526a5dc9eb33e10c228551fccdc545d1948854 (patch)
tree55ab14986583c1cb0f1a982509261d1451e82ef3 /gtk/gtklabel.c
parentea8167d9194cc3aac2b747f88df628faa7288629 (diff)
downloadgtk+-8f526a5dc9eb33e10c228551fccdc545d1948854.tar.gz
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)
Diffstat (limited to 'gtk/gtklabel.c')
-rw-r--r--gtk/gtklabel.c8
1 files changed, 5 insertions, 3 deletions
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;