Fix padding handling

94dc872f · Matthias Clasen · afab67f9 · 94dc872f · 94dc872f · 94dc872f
Commit 94dc872f authored Feb 03, 2006 by Matthias Clasen
Hide whitespace changes
Inline Side-by-side

Showing with 11 additions and 3 deletions

ChangeLog ChangeLog +5 -0

ChangeLog.pre-2-10 ChangeLog.pre-2-10 +5 -0

gtk/gtklabel.c gtk/gtklabel.c +1 -3

No files found.
--- a/ChangeLog
+++ b/ChangeLog
+2006-02-03  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtklabel.c (get_layout_location): Fix handling
+	of padding in RTL.  (#329099, Hooman Mesgary) 
+
 2006-02-02  Matthias Clasen  <mclasen@redhat.com>

 	* gdk/x11/gdkdnd-x11.c (_gdk_drag_get_protocol_for_display):

--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
+2006-02-03  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtklabel.c (get_layout_location): Fix handling
+	of padding in RTL.  (#329099, Hooman Mesgary) 
+
 2006-02-02  Matthias Clasen  <mclasen@redhat.com>

 	* gdk/x11/gdkdnd-x11.c (_gdk_drag_get_protocol_for_display):

--- 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),