summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFlorian Müllner <florian.muellner@gmail.com>2013-07-06 01:38:28 +0200
committerEmmanuele Bassi <ebassi@gnome.org>2013-08-19 23:37:43 +0100
commit40a1903db6dd80445275b3f73a53fd7b7df47017 (patch)
treebb1cb90890c8a779c9322ea8124922e0b8a188d5
parent5dd2dcf14ff4676ac4d84ef567d1bca1faaaab7a (diff)
downloadclutter-40a1903db6dd80445275b3f73a53fd7b7df47017.tar.gz
bin-layout: Fix offsets
Just as BoxLayout, BinLayout uses an odd interpretation of the box passed into allocate(): to define a child area of (w x h) starting at (x, y), callers need to pass a box of (x, 2 * x + w, y, 2 * y + h). This behavior is just confusing, change it to use the full box for child allocations. https://bugzilla.gnome.org/show_bug.cgi?id=703809
-rw-r--r--clutter/clutter-bin-layout.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/clutter/clutter-bin-layout.c b/clutter/clutter-bin-layout.c
index a0a4ec5f4..adf235db2 100644
--- a/clutter/clutter-bin-layout.c
+++ b/clutter/clutter-bin-layout.c
@@ -489,8 +489,8 @@ clutter_bin_layout_allocate (ClutterLayoutManager *manager,
else
child_alloc.y1 = allocation_y;
- child_alloc.x2 = available_w;
- child_alloc.y2 = available_h;
+ child_alloc.x2 = allocation_x + available_w;
+ child_alloc.y2 = allocation_y + available_h;
if (clutter_actor_needs_expand (child, CLUTTER_ORIENTATION_HORIZONTAL))
{