callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

label: Set wrap on the layout unconditionally

Browse Source
This commit is contained in:
Benjamin Otte 2011-04-18 00:29:16 +02:00
parent ffb23fb827
commit 8e34bff045
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gtk/gtklabel.c
View File

@ -3387,7 +3387,6 @@ gtk_label_update_layout_width (GtkLabel *label)
else else
width = allocation.width - xpad * 2; width = allocation.width - xpad * 2;
pango_layout_set_wrap (priv->layout, priv->wrap_mode);
pango_layout_set_width (priv->layout, MAX (width, 1) * PANGO_SCALE); pango_layout_set_width (priv->layout, MAX (width, 1) * PANGO_SCALE);
} }
else /* !priv->wrap */ else /* !priv->wrap */
@ -3460,6 +3459,7 @@ gtk_label_ensure_layout (GtkLabel *label)
pango_layout_set_alignment (priv->layout, align); pango_layout_set_alignment (priv->layout, align);
pango_layout_set_ellipsize (priv->layout, priv->ellipsize); pango_layout_set_ellipsize (priv->layout, priv->ellipsize);
pango_layout_set_wrap (priv->layout, priv->wrap_mode);
pango_layout_set_single_paragraph_mode (priv->layout, priv->single_line_mode); pango_layout_set_single_paragraph_mode (priv->layout, priv->single_line_mode);
gtk_label_update_layout_width (label); gtk_label_update_layout_width (label);