isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-11-23 00:20:42 -05:00
Code Issues Packages Projects Releases Wiki Activity

box-layout: Small cleanups

Browse Source
This commit is contained in:
Emmanuele Bassi 2010-09-22 12:46:47 +01:00
parent acc7d48e47
commit 60c9dc25df
1 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -670,6 +670,8 @@ allocate_box_child (ClutterBoxLayout *self,
clutter_actor_get_preferred_height (child, avail_width, clutter_actor_get_preferred_height (child, avail_width,
NULL, &child_nat); NULL, &child_nat);
child_nat = MIN (child_nat, avail_height);
child_box.y1 = floorf (*position + 0.5); child_box.y1 = floorf (*position + 0.5);
if (priv->is_homogeneous) if (priv->is_homogeneous)
@ -687,6 +689,8 @@ allocate_box_child (ClutterBoxLayout *self,
clutter_actor_get_preferred_width (child, avail_height, clutter_actor_get_preferred_width (child, avail_height,
NULL, &child_nat); NULL, &child_nat);
child_nat = MIN (child_nat, avail_width);
child_box.x1 = floorf (*position + 0.5); child_box.x1 = floorf (*position + 0.5);
if (priv->is_homogeneous) if (priv->is_homogeneous)
@ -813,7 +817,7 @@ clutter_box_layout_allocate (ClutterLayoutManager *layout,
{ {
ClutterBoxLayoutPrivate *priv = CLUTTER_BOX_LAYOUT (layout)->priv; ClutterBoxLayoutPrivate *priv = CLUTTER_BOX_LAYOUT (layout)->priv;
gfloat avail_width, avail_height, pref_width, pref_height; gfloat avail_width, avail_height, pref_width, pref_height;
gint n_expand_children, extra_space; gint n_expand_children, n_children, extra_space;
GList *children, *l; GList *children, *l;
gfloat position; gfloat position;
gboolean is_rtl; gboolean is_rtl;
@ -846,7 +850,7 @@ clutter_box_layout_allocate (ClutterLayoutManager *layout,
} }
/* count the number of children with expand set to TRUE */ /* count the number of children with expand set to TRUE */
n_expand_children = 0; n_children = n_expand_children = 0;
for (l = children; l; l = l->next) for (l = children; l; l = l->next)
{ {
ClutterLayoutMeta *meta; ClutterLayoutMeta *meta;
@ -857,21 +861,18 @@ clutter_box_layout_allocate (ClutterLayoutManager *layout,
if (CLUTTER_BOX_CHILD (meta)->expand) if (CLUTTER_BOX_CHILD (meta)->expand)
n_expand_children++; n_expand_children++;
n_children++;
} }
if (priv->is_homogeneous) if (priv->is_homogeneous)
{ {
gint n_children;
n_children = g_list_length (children);
if (priv->is_vertical) if (priv->is_vertical)
{ extra_space = (avail_height - (n_children - 1) * priv->spacing)
extra_space = (avail_height - (n_children - 1)*priv->spacing)/n_children; / n_children;
}
else else
{ extra_space = (avail_width - (n_children - 1) * priv->spacing)
extra_space = (avail_width - (n_children - 1)*priv->spacing)/n_children; / n_children;
}
} }
else if (n_expand_children == 0) else if (n_expand_children == 0)
{ {