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

workspaceAnimation: Stop depending on shellwm

Browse Source 
https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/605
This commit is contained in:
Alexander Mikhaylenko
2020-01-21 18:09:56 +05:00
committed by Florian Müllner
parent fa31bcaa7a
commit 6d5446e4a6
2 changed files with 20 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
js/ui/windowManager.js
View File

@ -945,6 +945,14 @@ var WindowManager = class {
this._workspaceAnimation =
new WorkspaceAnimation.WorkspaceAnimationController();
this._shellwm.connect('kill-switch-workspace', () => {
if (!this._workspaceAnimation.isAnimating() || this._workspaceAnimation.canCancelGesture())
return;
this._workspaceAnimation.cancelSwitchAnimation();
this._shellwm.completed_switch_workspace();
});
}
_showPadOsd(display, device, settings, imagePath, editionMode, monitorIndex) {
@ -1554,8 +1562,9 @@ var WindowManager = class {
return;
}
this._workspaceAnimation.animateSwitchWorkspace(shellwm, from, to,
direction);
this._workspaceAnimation.animateSwitchWorkspace(from, to, direction, () => {
this._shellwm.completed_switch_workspace();
});
}
_showTilePreview(shellwm, window, tileRect, monitorIndex) {