[clutter/clutter-1.14] bin-layout: Fix offsets
- From: Emmanuele Bassi <ebassi src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [clutter/clutter-1.14] bin-layout: Fix offsets
- Date: Thu, 21 Nov 2013 00:10:38 +0000 (UTC)
commit def93f697c83704179cc2aaadb3955d566f24be5
Author: Florian Müllner <florian muellner gmail com>
Date: Sat Jul 6 01:38:28 2013 +0200
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>
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 de7370e..dc8341c 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))
{
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]