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

workspaceAnimation: Stop depending on shellwm

Browse Source 
Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/1326>
This commit is contained in:
Alexander Mikhaylenko
2020-01-21 18:09:56 +05:00
committed by Marge Bot
parent bebd612a8f
commit 269c5ca957
2 changed files with 34 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
js/ui/windowManager.js
View File

@ -960,6 +960,11 @@ var WindowManager = class {
this._workspaceAnimation =
new WorkspaceAnimation.WorkspaceAnimationController();
this._shellwm.connect('kill-switch-workspace', () => {
this._workspaceAnimation.cancelSwitchAnimation();
this._switchWorkspaceDone();
});
}
async _startX11Services(task, cancellable) {
@ -1618,7 +1623,20 @@ var WindowManager = class {
return;
}
this._workspaceAnimation.animateSwitch(shellwm, from, to, direction);
this._switchInProgress = true;
this._workspaceAnimation.animateSwitch(from, to, direction, () => {
this._shellwm.completed_switch_workspace();
this._switchInProgress = false;
});
}
_switchWorkspaceDone() {
if (!this._switchInProgress)
return;
this._shellwm.completed_switch_workspace();
this._switchInProgress = false;
}
_showTilePreview(shellwm, window, tileRect, monitorIndex) {