Flip the padding

diff --git a/ChangeLog b/ChangeLog
index 005494f7fd101b618a88a4ca4f4656911dea0625..8f36b0c071c378192efc7f00b01fd85578d76275 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-05-09  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtkalignment.c (gtk_alignment_size_allocate): Flip the
+       padding in RTL mode.  (#303572, Maciej Katafiasz)
+
 2005-05-09  Owen Taylor  <otaylor@redhat.com>
 
        * gdk/gdkrgb.c (gdk_rgb_convert_0888_br, gdk_rgb_convert_8880_br): 

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 005494f7fd101b618a88a4ca4f4656911dea0625..8f36b0c071c378192efc7f00b01fd85578d76275 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+2005-05-09  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtkalignment.c (gtk_alignment_size_allocate): Flip the
+       padding in RTL mode.  (#303572, Maciej Katafiasz)
+
 2005-05-09  Owen Taylor  <otaylor@redhat.com>
 
        * gdk/gdkrgb.c (gdk_rgb_convert_0888_br, gdk_rgb_convert_8880_br): 

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 005494f7fd101b618a88a4ca4f4656911dea0625..8f36b0c071c378192efc7f00b01fd85578d76275 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+2005-05-09  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtkalignment.c (gtk_alignment_size_allocate): Flip the
+       padding in RTL mode.  (#303572, Maciej Katafiasz)
+
 2005-05-09  Owen Taylor  <otaylor@redhat.com>
 
        * gdk/gdkrgb.c (gdk_rgb_convert_0888_br, gdk_rgb_convert_8880_br): 

diff --git a/gtk/gtkalignment.c b/gtk/gtkalignment.c
index 2b8f692f2592b0a240768d9ad4d34bfdfc3d6a1d..25aa56f387f95e3358cc96e395ede8ecd90e97dd 100644 (file)
--- a/gtk/gtkalignment.c
+++ b/gtk/gtkalignment.c
@@ -479,7 +479,6 @@ gtk_alignment_size_allocate (GtkWidget     *widget,
   gint border_width;
   gint padding_horizontal, padding_vertical;
   GtkAlignmentPrivate *priv;
-  gfloat xalign;
 
   padding_horizontal = 0;
   padding_vertical = 0;
@@ -515,11 +514,11 @@ gtk_alignment_size_allocate (GtkWidget     *widget,
       else
        child_allocation.height = height;
 
-      xalign = alignment->xalign;
       if (gtk_widget_get_direction (widget) == GTK_TEXT_DIR_RTL)
-       xalign = 1.0 - xalign;
+       child_allocation.x = (1.0 - alignment->xalign) * (width - child_allocation.width) + allocation->x + border_width + priv->padding_right;
+      else 
+       child_allocation.x = alignment->xalign * (width - child_allocation.width) + allocation->x + border_width + priv->padding_left;
 
-      child_allocation.x = xalign * (width - child_allocation.width) + allocation->x + border_width + priv->padding_left;
       child_allocation.y = alignment->yalign * (height - child_allocation.height) + allocation->y + border_width + priv->padding_top;
 
       gtk_widget_size_allocate (bin->child, &child_allocation);