diff options
| author | Matthias Clasen <matthiasc@src.gnome.org> | 2005-05-10 03:44:02 +0000 |
|---|---|---|
| committer | Matthias Clasen <matthiasc@src.gnome.org> | 2005-05-10 03:44:02 +0000 |
| commit | 0a28c9f67842d02bce2b93a1bd829b7491c180af (patch) | |
| tree | 36b05b050a3b3a399b0c05f38f12e1b6f51fa1bf | |
| parent | 485fd851791e731e3b919a78033c44f5ec5e1081 (diff) | |
| download | gtk+-0a28c9f67842d02bce2b93a1bd829b7491c180af.tar.gz | |
Flip the padding
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | ChangeLog.pre-2-10 | 5 | ||||
| -rw-r--r-- | ChangeLog.pre-2-8 | 5 | ||||
| -rw-r--r-- | gtk/gtkalignment.c | 7 |
4 files changed, 18 insertions, 4 deletions
@@ -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 005494f7fd..8f36b0c071 100644 --- 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 005494f7fd..8f36b0c071 100644 --- 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 2b8f692f25..25aa56f387 100644 --- 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); |