AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests 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:44:11 +00:00 committed by Matthias Clasen
parent ea8167d919
commit 8f526a5dc9
3 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -1,5 +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)
* gdk/gdkregion-generic.c (miRegionCopy): Fix this for the
single-rectangle case. (#326127, Benjamin Berg)
(gdk_region_copy): Use miRegionCopy() here.

3
ChangeLog.pre-2-10
View File

@ -1,5 +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)
* gdk/gdkregion-generic.c (miRegionCopy): Fix this for the
single-rectangle case. (#326127, Benjamin Berg)
(gdk_region_copy): Use miRegionCopy() here.

8
gtk/gtklabel.c
View File

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