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

actor: Update preferred size using constraints

Browse Source 
If an actor has any constraint that may affect its preferred size, then
it should query them when computing its preferred size.
This commit is contained in:
Emmanuele Bassi 2014-12-14 14:44:04 +00:00
parent 391f1d8dd4
commit 66d48bcca0
1 changed files with 54 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
clutter/clutter-actor.c
View File

@ -9306,6 +9306,46 @@ _clutter_actor_get_cached_size_request (gfloat for_size,
return FALSE; return FALSE;
} }
static void
clutter_actor_update_preferred_size_for_constraints (ClutterActor *self,
ClutterOrientation direction,
float for_size,
float *minimum_size,
float *natural_size)
{
ClutterActorPrivate *priv = self->priv;
const GList *constraints, *l;
if (priv->constraints == NULL)
return;
constraints = _clutter_meta_group_peek_metas (priv->constraints);
for (l = constraints; l != NULL; l = l->next)
{
ClutterConstraint *constraint = l->data;
ClutterActorMeta *meta = l->data;
if (!clutter_actor_meta_get_enabled (meta))
continue;
clutter_constraint_update_preferred_size (constraint, self,
direction,
for_size,
minimum_size,
natural_size);
CLUTTER_NOTE (LAYOUT,
"Preferred %s of '%s' after constraint '%s': "
"{ min:%.2f, nat:%.2f }",
direction == CLUTTER_ORIENTATION_HORIZONTAL
? "width"
: "height",
_clutter_actor_get_debug_name (self),
_clutter_actor_meta_get_debug_name (meta),
*minimum_size, *natural_size);
}
}
/** /**
* clutter_actor_get_preferred_width: * clutter_actor_get_preferred_width:
* @self: A #ClutterActor * @self: A #ClutterActor
@ -9404,6 +9444,13 @@ clutter_actor_get_preferred_width (ClutterActor *self,
&minimum_width, &minimum_width,
&natural_width); &natural_width);
/* adjust for constraints */
clutter_actor_update_preferred_size_for_constraints (self,
CLUTTER_ORIENTATION_HORIZONTAL,
for_height,
&minimum_width,
&natural_width);
/* adjust for the margin */ /* adjust for the margin */
minimum_width += (info->margin.left + info->margin.right); minimum_width += (info->margin.left + info->margin.right);
natural_width += (info->margin.left + info->margin.right); natural_width += (info->margin.left + info->margin.right);
@ -9540,6 +9587,13 @@ clutter_actor_get_preferred_height (ClutterActor *self,
&minimum_height, &minimum_height,
&natural_height); &natural_height);
/* adjust for constraints */
clutter_actor_update_preferred_size_for_constraints (self,
CLUTTER_ORIENTATION_VERTICAL,
for_width,
&minimum_height,
&natural_height);
/* adjust for margin */ /* adjust for margin */
minimum_height += (info->margin.top + info->margin.bottom); minimum_height += (info->margin.top + info->margin.bottom);
natural_height += (info->margin.top + info->margin.bottom); natural_height += (info->margin.top + info->margin.bottom);