[clutter/clutter-1.16] box-layout: Fix RTL layout swapping with non-zero container offsets

[Jasper St. Pierre <jstpierre src gnome org>]

commit 05f56affe19468e1e54281230cd23333f94cfebb
Author: Jasper St. Pierre <jstpierre mecheye net>
Date:   Fri Jun 14 17:49:01 2013 -0400

    box-layout: Fix RTL layout swapping with non-zero container offsets
    
    https://bugzilla.gnome.org/show_bug.cgi?id=706450

 clutter/clutter-box-layout.c |    6 ++----
 1 files changed, 2 insertions(+), 4 deletions(-)
---
diff --git a/clutter/clutter-box-layout.c b/clutter/clutter-box-layout.c
index b424aff..958f26d 100644
--- a/clutter/clutter-box-layout.c
+++ b/clutter/clutter-box-layout.c
@@ -1217,10 +1217,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;
             }
 
         }