sungmg/mutter-performance-source
1
0
Fork 0
Code Activity

clutter/actor: Always query layout manager when getting size

Browse source 
There are cases where a layout manager used by an actor also wants to
return a custom size when the actor has no children, for example in case
the layout manager requests a fixed size. This is currently impossible
because we only query the layout manager when calculating the preferred
size if the actor has children.

So fix that and also use the layout managers size negotiation functions
in case the actor has no children.

https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1322
This commit is contained in:
Jonas Dreßler 2020-06-18 17:07:33 +02:00
parent 1398c6dfa4
commit ad50d2cfc4
1 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
clutter/clutter/clutter-actor.c
View file

@ -2443,8 +2443,7 @@ clutter_actor_real_get_preferred_width (ClutterActor *self,
{
ClutterActorPrivate *priv = self->priv;
if (priv->n_children != 0 &&
priv->layout_manager != NULL)
if (priv->layout_manager != NULL)
{
ClutterContainer *container = CLUTTER_CONTAINER (self);
@ -2483,8 +2482,7 @@ clutter_actor_real_get_preferred_height (ClutterActor *self,
{
ClutterActorPrivate *priv = self->priv;
if (priv->n_children != 0 &&
priv->layout_manager != NULL)
if (priv->layout_manager != NULL)
{
ClutterContainer *container = CLUTTER_CONTAINER (self);