brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

box-layout: Honor actor expand and alignment

Browse Source 
Check if the actor has needs to expand and use Actor.allocate() instead
of Actor.allocate_align_fill() in that case.

https://bugzilla.gnome.org/show_bug.cgi?id=677283
This commit is contained in:
Bastian Winkler 2012-06-01 16:43:11 +02:00
parent 8e24de86b6
commit 157353ec3c
1 changed files with 22 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -640,12 +640,19 @@ allocate_box_child (ClutterBoxLayout *self,
clutter_actor_set_easing_delay (child, easing_delay); clutter_actor_set_easing_delay (child, easing_delay);
} }
clutter_actor_allocate_align_fill (child, child_box, /* call allocate() instead of allocate_align_fill() if the actor needs
get_box_alignment_factor (box_child->x_align), * expand in either direction. this will honour the actors alignment settings
get_box_alignment_factor (box_child->y_align), */
box_child->x_fill, if (clutter_actor_needs_expand (child, CLUTTER_ORIENTATION_HORIZONTAL) ||
box_child->y_fill, clutter_actor_needs_expand (child, CLUTTER_ORIENTATION_VERTICAL))
flags); clutter_actor_allocate (child, child_box, flags);
else
clutter_actor_allocate_align_fill (child, child_box,
get_box_alignment_factor (box_child->x_align),
get_box_alignment_factor (box_child->y_align),
box_child->x_fill,
box_child->y_fill,
flags);
if (use_animations) if (use_animations)
clutter_actor_restore_easing_state (child); clutter_actor_restore_easing_state (child);
@ -685,6 +692,7 @@ count_expand_children (ClutterLayoutManager *layout,
gint *visible_children, gint *visible_children,
gint *expand_children) gint *expand_children)
{ {
ClutterBoxLayoutPrivate *priv = CLUTTER_BOX_LAYOUT (layout)->priv;
ClutterActor *actor, *child; ClutterActor *actor, *child;
ClutterActorIter iter; ClutterActorIter iter;
@ -705,7 +713,8 @@ count_expand_children (ClutterLayoutManager *layout,
container, container,
child); child);
if (CLUTTER_BOX_CHILD (meta)->expand) if (clutter_actor_needs_expand (child, priv->orientation) ||
CLUTTER_BOX_CHILD (meta)->expand)
*expand_children += 1; *expand_children += 1;
} }
} }
@ -1025,7 +1034,8 @@ clutter_box_layout_allocate (ClutterLayoutManager *layout,
{ {
child_size = sizes[i].minimum_size; child_size = sizes[i].minimum_size;
if (box_child->expand) if (clutter_actor_needs_expand (child, priv->orientation) ||
box_child->expand)
{ {
child_size += extra; child_size += extra;
@ -1040,7 +1050,8 @@ clutter_box_layout_allocate (ClutterLayoutManager *layout,
/* Assign the child's position. */ /* Assign the child's position. */
if (priv->orientation == CLUTTER_ORIENTATION_VERTICAL) if (priv->orientation == CLUTTER_ORIENTATION_VERTICAL)
{ {
if (box_child->y_fill) if (clutter_actor_needs_expand (child, priv->orientation) ||
box_child->y_fill)
{ {
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);
@ -1065,7 +1076,8 @@ clutter_box_layout_allocate (ClutterLayoutManager *layout,
} }
else /* CLUTTER_ORIENTATION_HORIZONTAL */ else /* CLUTTER_ORIENTATION_HORIZONTAL */
{ {
if (box_child->x_fill) if (clutter_actor_needs_expand (child, priv->orientation) ||
box_child->x_fill)
{ {
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);