summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJasper St. Pierre <jstpierre@mecheye.net>2013-06-14 17:49:01 -0400
committerEmmanuele Bassi <ebassi@gnome.org>2013-11-20 23:17:06 +0000
commit51ab8f36c0db72eb65d96da75ab10a43ff8c6785 (patch)
treedec4b322fd8c9f88ebeba364cf8ccf81bd1f36b6
parent3631ad44144985d62f7a9cd57e9be8c71b5157d0 (diff)
downloadclutter-51ab8f36c0db72eb65d96da75ab10a43ff8c6785.tar.gz
box-layout: Fix RTL layout swapping with non-zero container offsets
https://bugzilla.gnome.org/show_bug.cgi?id=706450 (cherry picked from commit 05f56affe19468e1e54281230cd23333f94cfebb) Signed-off-by: Emmanuele Bassi <ebassi@gnome.org>
-rw-r--r--clutter/clutter-box-layout.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/clutter/clutter-box-layout.c b/clutter/clutter-box-layout.c
index 19d9fb379..f7af4efa5 100644
--- a/clutter/clutter-box-layout.c
+++ b/clutter/clutter-box-layout.c
@@ -1219,10 +1219,8 @@ clutter_box_layout_allocate (ClutterLayoutManager *layout,
{
gfloat width = child_allocation.x2 - child_allocation.x1;
- child_allocation.x1 = box->x2 - box->x1
- - child_allocation.x1
- - (child_allocation.x2 - child_allocation.x1);
- child_allocation.x2 = child_allocation.x1 + width;
+ child_allocation.x2 = box->x1 + (box->x2 - child_allocation.x1);
+ child_allocation.x1 = child_allocation.x2 - width;
}
}