From 51ab8f36c0db72eb65d96da75ab10a43ff8c6785 Mon Sep 17 00:00:00 2001 From: "Jasper St. Pierre" Date: Fri, 14 Jun 2013 17:49:01 -0400 Subject: 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 --- clutter/clutter-box-layout.c | 6 ++---- 1 file 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; } } -- cgit v1.2.1