From 94dc872ff5e50fde5199e44605a613944a50b2ed Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Fri, 3 Feb 2006 05:37:06 +0000 Subject: [PATCH] Fix padding handling --- ChangeLog | 5 +++++ ChangeLog.pre-2-10 | 5 +++++ gtk/gtklabel.c | 4 +--- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1452f04a4..67bb5c2e3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2006-02-03 Matthias Clasen + + * gtk/gtklabel.c (get_layout_location): Fix handling + of padding in RTL. (#329099, Hooman Mesgary) + 2006-02-02 Matthias Clasen * gdk/x11/gdkdnd-x11.c (_gdk_drag_get_protocol_for_display): diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 1452f04a4..67bb5c2e3 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +2006-02-03 Matthias Clasen + + * gtk/gtklabel.c (get_layout_location): Fix handling + of padding in RTL. (#329099, Hooman Mesgary) + 2006-02-02 Matthias Clasen * gdk/x11/gdkdnd-x11.c (_gdk_drag_get_protocol_for_display): diff --git a/gtk/gtklabel.c b/gtk/gtklabel.c index 1ad227dc7..28ea816c0 100644 --- a/gtk/gtklabel.c +++ b/gtk/gtklabel.c @@ -2237,9 +2237,7 @@ get_layout_location (GtkLabel *label, if (gtk_widget_get_direction (widget) == GTK_TEXT_DIR_LTR) x = MAX (x, widget->allocation.x + misc->xpad); else - x = MIN (x, - widget->allocation.x + widget->allocation.width - - req_width - misc->xpad); + x = MIN (x, widget->allocation.x + widget->allocation.width - misc->xpad); y = floor (widget->allocation.y + (gint)misc->ypad + MAX (((widget->allocation.height - widget->requisition.height) * misc->yalign),