isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-12-24 20:12:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

box-layout: Fix (legacy) expand/fill properties

Browse Source 
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
This commit is contained in:
Florian Müllner 2013-07-06 02:11:42 +02:00 committed by Emmanuele Bassi
parent 40a1903db6
commit 8e850ff3e4
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
clutter/clutter-box-layout.c
View File

@ -1164,7 +1164,7 @@ clutter_box_layout_allocate (ClutterLayoutManager *layout,
if (priv->orientation == CLUTTER_ORIENTATION_VERTICAL) if (priv->orientation == CLUTTER_ORIENTATION_VERTICAL)
{ {
if (clutter_actor_needs_expand (child, priv->orientation) || if (clutter_actor_needs_expand (child, priv->orientation) ||
box_child->y_fill) box_child->expand)
{ {
child_allocation.y1 = y; child_allocation.y1 = y;
child_allocation.y2 = child_allocation.y1 + MAX (1.0, child_size); child_allocation.y2 = child_allocation.y1 + MAX (1.0, child_size);
@ -1190,7 +1190,7 @@ clutter_box_layout_allocate (ClutterLayoutManager *layout,
else /* CLUTTER_ORIENTATION_HORIZONTAL */ else /* CLUTTER_ORIENTATION_HORIZONTAL */
{ {
if (clutter_actor_needs_expand (child, priv->orientation) || if (clutter_actor_needs_expand (child, priv->orientation) ||
box_child->x_fill) box_child->expand)
{ {
child_allocation.x1 = x; child_allocation.x1 = x;
child_allocation.x2 = child_allocation.x1 + MAX (1.0, child_size); child_allocation.x2 = child_allocation.x1 + MAX (1.0, child_size);