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

workspace: Don't keep stale clones in list

Browse Source 
If a clone gets destroyed before the corresponding MetaWindow is
removed from the workspace, we will still find it in the list of
clones and try to destroy it again. Avoid the resulting warnings
by updating the list of clones immediately when a clone is destroyed.

https://bugzilla.gnome.org/show_bug.cgi?id=791233
This commit is contained in:
Florian Müllner 2018-07-09 11:50:25 +02:00
parent ccadf6aca1
commit d0bdea3178
1 changed files with 32 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
js/ui/workspace.js
View File

@ -1443,34 +1443,26 @@ var Workspace = new Lang.Class({
_doRemoveWindow(metaWin) { _doRemoveWindow(metaWin) {
let win = metaWin.get_compositor_private(); let win = metaWin.get_compositor_private();
// find the position of the window in our list let clone = this._removeWindowClone(metaWin);
let index = this._lookupIndex (metaWin);
if (index == -1) if (clone) {
return; // If metaWin.get_compositor_private() returned non-NULL, that
// means the window still exists (and is just being moved to
let clone = this._windows[index]; // another workspace or something), so set its overviewHint
// accordingly. (If it returned NULL, then the window is being
this._windows.splice(index, 1); // destroyed; we'd like to animate this, but it's too late at
this._windowOverlays.splice(index, 1); // this point.)
if (win) {
// If metaWin.get_compositor_private() returned non-NULL, that let [stageX, stageY] = clone.actor.get_transformed_position();
// means the window still exists (and is just being moved to let [stageWidth, stageHeight] = clone.actor.get_transformed_size();
// another workspace or something), so set its overviewHint win._overviewHint = {
// accordingly. (If it returned NULL, then the window is being x: stageX,
// destroyed; we'd like to animate this, but it's too late at y: stageY,
// this point.) scale: stageWidth / clone.actor.width
if (win) { };
let [stageX, stageY] = clone.actor.get_transformed_position(); }
let [stageWidth, stageHeight] = clone.actor.get_transformed_size(); clone.destroy();
win._overviewHint = {
x: stageX,
y: stageY,
scale: stageWidth / clone.actor.width
};
} }
clone.destroy();
// We need to reposition the windows; to avoid shuffling windows // We need to reposition the windows; to avoid shuffling windows
// around while the user is interacting with the workspace, we delay // around while the user is interacting with the workspace, we delay
@ -1865,6 +1857,9 @@ var Workspace = new Lang.Class({
clone.connect('size-changed', () => { clone.connect('size-changed', () => {
this._recalculateWindowPositions(WindowPositionFlags.NONE); this._recalculateWindowPositions(WindowPositionFlags.NONE);
}); });
clone.actor.connect('destroy', () => {
this._removeWindowClone(clone.metaWindow);
});
this.actor.add_actor(clone.actor); this.actor.add_actor(clone.actor);
@ -1886,6 +1881,17 @@ var Workspace = new Lang.Class({
return [clone, overlay]; return [clone, overlay];
}, },
_removeWindowClone(metaWin) {
// find the position of the window in our list
let index = this._lookupIndex (metaWin);
if (index == -1)
return null;
this._windowOverlays.splice(index, 1);
return this._windows.splice(index, 1).pop();
},
_onShowOverlayClose(windowOverlay) { _onShowOverlayClose(windowOverlay) {
for (let i = 0; i < this._windowOverlays.length; i++) { for (let i = 0; i < this._windowOverlays.length; i++) {
let overlay = this._windowOverlays[i]; let overlay = this._windowOverlays[i];