From 0c5dbf375bd2294840167659c22c90bbedf00d5e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20M=C3=BCllner?= Date: Sat, 6 Jul 2013 02:11:42 +0200 Subject: box-layout: Fix (legacy) expand/fill properties Whether a child should receive extra space should be determined by the expand property, not [xy]_fill (which just determine how additional space should be used). The behavior is already correct when using the ClutterActor:[xy]_expand properties, but needs fixing for the corresponding ClutterBoxLayoutChild property. https://bugzilla.gnome.org/show_bug.cgi?id=703809 (cherry picked from commit 8e850ff3e4f02d37ec7ecc272eea540ffd29dbcf) Signed-off-by: Emmanuele Bassi --- clutter/clutter-box-layout.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/clutter/clutter-box-layout.c b/clutter/clutter-box-layout.c index f7af4efa5..f45180a4a 100644 --- a/clutter/clutter-box-layout.c +++ b/clutter/clutter-box-layout.c @@ -1166,7 +1166,7 @@ clutter_box_layout_allocate (ClutterLayoutManager *layout, if (priv->orientation == CLUTTER_ORIENTATION_VERTICAL) { if (clutter_actor_needs_expand (child, priv->orientation) || - box_child->y_fill) + box_child->expand) { child_allocation.y1 = y; child_allocation.y2 = child_allocation.y1 + MAX (1.0, child_size); @@ -1192,7 +1192,7 @@ clutter_box_layout_allocate (ClutterLayoutManager *layout, else /* CLUTTER_ORIENTATION_HORIZONTAL */ { if (clutter_actor_needs_expand (child, priv->orientation) || - box_child->x_fill) + box_child->expand) { child_allocation.x1 = x; child_allocation.x2 = child_allocation.x1 + MAX (1.0, child_size); -- cgit v1.2.1