[clutter/clutter-1.16] box-layout: Fix child offsets
- From: Emmanuele Bassi <ebassi src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [clutter/clutter-1.16] box-layout: Fix child offsets
- Date: Mon, 19 Aug 2013 23:23:10 +0000 (UTC)
commit 5dd2dcf14ff4676ac4d84ef567d1bca1faaaab7a
Author: Florian Müllner <florian muellner gmail com>
Date: Sat Jul 6 01:27:38 2013 +0200
box-layout: Fix child offsets
Currently, BoxLayout interprets the box passed into allocate() in
a fairly peculiar way:
- in the direction of the box, all space between [xy]1 and [xy]2
is distributed among children (e.g. children occupy the entire
width/height of the box, offset by [xy]1)
- in the opposite direction, expanded children receive space
between [xy]1 and the height/width of the box (e.g. children
occupy the width/height of the box minus [xy]1, offset by [xy]1)
The second behavior doesn't make much sense, so adjust it to interpret
the box parameter in the same way as the first one.
https://bugzilla.gnome.org/show_bug.cgi?id=703809
clutter/clutter-box-layout.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/clutter/clutter-box-layout.c b/clutter/clutter-box-layout.c
index b9c2c68..ea4d208 100644
--- a/clutter/clutter-box-layout.c
+++ b/clutter/clutter-box-layout.c
@@ -1100,7 +1100,7 @@ clutter_box_layout_allocate (ClutterLayoutManager *layout,
if (priv->orientation == CLUTTER_ORIENTATION_VERTICAL)
{
child_allocation.x1 = box->x1;
- child_allocation.x2 = MAX (1.0, box->x2 - box->x1);
+ child_allocation.x2 = MAX (1.0, box->x2);
if (priv->is_pack_start)
y = box->y2 - box->y1;
else
@@ -1109,7 +1109,7 @@ clutter_box_layout_allocate (ClutterLayoutManager *layout,
else
{
child_allocation.y1 = box->y1;
- child_allocation.y2 = MAX (1.0, box->y2 - box->y1);
+ child_allocation.y2 = MAX (1.0, box->y2);
if (priv->is_pack_start)
x = box->x2 - box->x1;
else
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]