Lerking/gtk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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)
This commit is contained in:
Matthias Clasen
2006-01-08 06:45:57 +00:00
committed by Matthias Clasen
parent a9be5ddf14
commit 42edcf8a77
3 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@@ -1,3 +1,8 @@
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)
2006-01-06 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkactiongroup.c (gtk_action_group_set_sensitive)

5
ChangeLog.pre-2-10
View File

@@ -1,3 +1,8 @@
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)
2006-01-06 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkactiongroup.c (gtk_action_group_set_sensitive)

4
gtk/gtklabel.c
View File

@@ -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;