clutter: Avoid redundant margin changes
When profiling gnome-shell it was found that one of the main triggers
of `clutter_actor_queue_relayout` during animations was
`clutter_actor_set_margin_internal` continuously setting the same
zero margins. That's obviously pointless and also expensive. So just
avoid redundant margin changes.
This helps to further improve performance in:
https://gitlab.gnome.org/GNOME/mutter/issues/233,
https://gitlab.gnome.org/GNOME/gnome-shell/issues/349
This change previously landed as 59acb3895
and then got reverted because
it was found to make gnome-shell#517 worse. However that bug now has a
proper fix and this branch isn't really directly related so is being
reproposed...
This commit is contained in:
parent
923751aa39
commit
e0fd7a6d05
1 changed files with 16 additions and 0 deletions
|
@ -18467,6 +18467,10 @@ clutter_actor_set_margin_top (ClutterActor *self,
|
||||||
g_return_if_fail (margin >= 0.f);
|
g_return_if_fail (margin >= 0.f);
|
||||||
|
|
||||||
info = _clutter_actor_get_layout_info_or_defaults (self);
|
info = _clutter_actor_get_layout_info_or_defaults (self);
|
||||||
|
|
||||||
|
if (info->margin.top == margin)
|
||||||
|
return;
|
||||||
|
|
||||||
_clutter_actor_create_transition (self, obj_props[PROP_MARGIN_TOP],
|
_clutter_actor_create_transition (self, obj_props[PROP_MARGIN_TOP],
|
||||||
info->margin.top,
|
info->margin.top,
|
||||||
margin);
|
margin);
|
||||||
|
@ -18511,6 +18515,10 @@ clutter_actor_set_margin_bottom (ClutterActor *self,
|
||||||
g_return_if_fail (margin >= 0.f);
|
g_return_if_fail (margin >= 0.f);
|
||||||
|
|
||||||
info = _clutter_actor_get_layout_info_or_defaults (self);
|
info = _clutter_actor_get_layout_info_or_defaults (self);
|
||||||
|
|
||||||
|
if (info->margin.bottom == margin)
|
||||||
|
return;
|
||||||
|
|
||||||
_clutter_actor_create_transition (self, obj_props[PROP_MARGIN_BOTTOM],
|
_clutter_actor_create_transition (self, obj_props[PROP_MARGIN_BOTTOM],
|
||||||
info->margin.bottom,
|
info->margin.bottom,
|
||||||
margin);
|
margin);
|
||||||
|
@ -18555,6 +18563,10 @@ clutter_actor_set_margin_left (ClutterActor *self,
|
||||||
g_return_if_fail (margin >= 0.f);
|
g_return_if_fail (margin >= 0.f);
|
||||||
|
|
||||||
info = _clutter_actor_get_layout_info_or_defaults (self);
|
info = _clutter_actor_get_layout_info_or_defaults (self);
|
||||||
|
|
||||||
|
if (info->margin.left == margin)
|
||||||
|
return;
|
||||||
|
|
||||||
_clutter_actor_create_transition (self, obj_props[PROP_MARGIN_LEFT],
|
_clutter_actor_create_transition (self, obj_props[PROP_MARGIN_LEFT],
|
||||||
info->margin.left,
|
info->margin.left,
|
||||||
margin);
|
margin);
|
||||||
|
@ -18599,6 +18611,10 @@ clutter_actor_set_margin_right (ClutterActor *self,
|
||||||
g_return_if_fail (margin >= 0.f);
|
g_return_if_fail (margin >= 0.f);
|
||||||
|
|
||||||
info = _clutter_actor_get_layout_info_or_defaults (self);
|
info = _clutter_actor_get_layout_info_or_defaults (self);
|
||||||
|
|
||||||
|
if (info->margin.right == margin)
|
||||||
|
return;
|
||||||
|
|
||||||
_clutter_actor_create_transition (self, obj_props[PROP_MARGIN_RIGHT],
|
_clutter_actor_create_transition (self, obj_props[PROP_MARGIN_RIGHT],
|
||||||
info->margin.right,
|
info->margin.right,
|
||||||
margin);
|
margin);
|
||||||
|
|
Loading…
Reference in a new issue