[gnome-shell] windowManager: Limit super-scroll handling to normal mode
- From: Marge Bot <marge-bot src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-shell] windowManager: Limit super-scroll handling to normal mode
- Date: Tue, 9 Mar 2021 12:32:19 +0000 (UTC)
commit fb1ab4f20b6566d7715a1327b326def601b36aa3
Author: Florian Müllner <fmuellner gnome org>
Date: Mon Mar 8 19:59:23 2021 +0100
windowManager: Limit super-scroll handling to normal mode
The overview has it's own workspace scroll handling, and we don't want
to switch workspaces in other modes. Limiting the scroll-event handler
to NORMAL mode matches the swipe tracker used by WorkspaceAnimation,
and allows for other uses of scroll events (like scrolling in the
alt-tab popup).
https://gitlab.gnome.org/GNOME/gnome-shell/-/issues/3840
Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/1746>
js/ui/windowManager.js | 4 ++++
1 file changed, 4 insertions(+)
---
diff --git a/js/ui/windowManager.js b/js/ui/windowManager.js
index 93777db22e..34c54b61e1 100644
--- a/js/ui/windowManager.js
+++ b/js/ui/windowManager.js
@@ -864,6 +864,10 @@ var WindowManager = class {
this._switchToApplication.bind(this));
global.stage.connect('scroll-event', (stage, event) => {
+ const allowedModes = Shell.ActionMode.NORMAL;
+ if ((allowedModes & Main.actionMode) === 0)
+ return Clutter.EVENT_PROPAGATE;
+
if (this._workspaceAnimation.canHandleScrollEvent(event))
return Clutter.EVENT_PROPAGATE;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]