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

workspace: Force creating new layout when there's no allocation yet

Browse Source 
Commit ba23279f1f was aimed at fixing a
bug where the layout is frozen so early that we don't have an existing
one to re-use, because no allocation cycle happened yet. It tried to fix
that by forcing the creation of a layout when needsLayout === true,
this turned out to be a bit too much, as it also forced creating a new
layout when the layout was frozen after closing a window (which would
set needsLayout to true).

To fix this regression and still avoid reintroducing the bug the
previous commit fixed, tighten the check a bit and only force creating
the new layout when there's no allocation yet. This makes freezing the
layout after closing a window work again.

Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/2236>
This commit is contained in:
Jonas Dreßler 2022-03-09 10:14:42 +01:00 committed by Marge Bot
parent 7bf8f40c84
commit b17f00cfb1
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
js/ui/workspace.js
View File

@ -628,7 +628,6 @@ var WorkspaceLayout = GObject.registerClass({
const [containerWidth, containerHeight] = containerBox.get_size(); const [containerWidth, containerHeight] = containerBox.get_size();
const containerAllocationChanged = const containerAllocationChanged =
this._lastBox === null || !this._lastBox.equal(containerBox); this._lastBox === null || !this._lastBox.equal(containerBox);
this._lastBox = containerBox.copy();
// If the containers size changed, we can no longer keep around // If the containers size changed, we can no longer keep around
// the old windowSlots, so we must unfreeze the layout. // the old windowSlots, so we must unfreeze the layout.
@ -665,7 +664,7 @@ var WorkspaceLayout = GObject.registerClass({
} }
let layoutChanged = false; let layoutChanged = false;
if (!this._layoutFrozen || this._needsLayout) { if (!this._layoutFrozen || !this._lastBox) {
if (this._needsLayout) { if (this._needsLayout) {
this._layout = this._createBestLayout(this._workarea); this._layout = this._createBestLayout(this._workarea);
this._needsLayout = false; this._needsLayout = false;
@ -765,6 +764,8 @@ var WorkspaceLayout = GObject.registerClass({
child.allocate(childBox); child.allocate(childBox);
} }
} }
this._lastBox = containerBox.copy();
} }
_syncOverlay(preview) { _syncOverlay(preview) {