isa/gnome-shell
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

dashSpacer: Don't trigger allocations from size negotiations

Browse Source 
If an actor's allocation is outdated, clutter_actor_get_allocation_box()
will queue a relayout. That's why it's advised to not use the function
unless the allocation is known to be valid (namely during paint), but
in particular not from within get_preferred_width/height vfuncs.

Using the :allocation property (which may be outdated) would be better,
but in this case we can simply delegate the request to the correct actor.

https://gitlab.gnome.org/GNOME/gnome-shell/issues/1065
This commit is contained in:
Florian Müllner 2019-04-30 13:31:51 +02:00 committed by Georges Basile Stavracas Neto
parent ed999ce926
commit d5ebd8c816
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
js/ui/overviewControls.js
View File

@ -369,17 +369,15 @@ class DashSpacer extends St.Widget {
} }
vfunc_get_preferred_width(forHeight) { vfunc_get_preferred_width(forHeight) {
let box = this.get_allocation_box(); if (this._bindConstraint)
let minWidth = super.vfunc_get_preferred_width(forHeight)[0]; return this._bindConstraint.source.get_preferred_width(forHeight);
let natWidth = box.x2 - box.x1; return super.vfunc_get_preferred_width(forHeight);
return [minWidth, natWidth];
} }
vfunc_get_preferred_height(forWidth) { vfunc_get_preferred_height(forWidth) {
let box = this.get_allocation_box(); if (this._bindConstraint)
let minHeight = super.vfunc_get_preferred_height(forWidth)[0]; return this._bindConstraint.source.get_preferred_height(forWidth);
let natHeight = box.y2 - box.y1; return super.vfunc_get_preferred_height(forWidth);
return [minHeight, natHeight];
} }
}); });