diff options
| author | Florian Müllner <florian.muellner@gmail.com> | 2013-07-06 01:38:28 +0200 |
|---|---|---|
| committer | Emmanuele Bassi <ebassi@gnome.org> | 2013-11-20 23:17:46 +0000 |
| commit | def93f697c83704179cc2aaadb3955d566f24be5 (patch) | |
| tree | 0606645c744880b1c803646b43b546044eeb5e43 | |
| parent | 0c5dbf375bd2294840167659c22c90bbedf00d5e (diff) | |
| download | clutter-def93f697c83704179cc2aaadb3955d566f24be5.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
(cherry picked from commit 40a1903db6dd80445275b3f73a53fd7b7df47017)
Signed-off-by: Emmanuele Bassi <ebassi@gnome.org>
| -rw-r--r-- | clutter/clutter-bin-layout.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/clutter/clutter-bin-layout.c b/clutter/clutter-bin-layout.c index de7370ee7..dc8341c3e 100644 --- a/clutter/clutter-bin-layout.c +++ b/clutter/clutter-bin-layout.c @@ -491,8 +491,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)) { |