From a0b3025f3c2aa11023ec12fedb007ed5e35baf73 Mon Sep 17 00:00:00 2001 From: Leo Date: Thu, 10 Aug 2023 11:54:50 +0900 Subject: [PATCH] Kill workspace switch when opening multitasking view (#1735) Co-authored-by: Ryan Kornheisl --- src/Widgets/MultitaskingView.vala | 5 +++++ src/WindowManager.vala | 4 +++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/src/Widgets/MultitaskingView.vala b/src/Widgets/MultitaskingView.vala index f8072e9d..c4952229 100644 --- a/src/Widgets/MultitaskingView.vala +++ b/src/Widgets/MultitaskingView.vala @@ -652,6 +652,11 @@ namespace Gala { opened = !opened; var opening = opened; + // https://github.com/elementary/gala/issues/1728 + if (opening) { + wm.kill_switch_workspace (); + } + foreach (var container in window_containers_monitors) { if (opening) { container.visible = true; diff --git a/src/WindowManager.vala b/src/WindowManager.vala index 582c9aba..335571f7 100644 --- a/src/WindowManager.vala +++ b/src/WindowManager.vala @@ -2081,7 +2081,6 @@ namespace Gala { switch_workspace_window_created_id = 0; } end_switch_workspace (); - switch_workspace_with_gesture = false; animating_switch_workspace = cancel_action; if (cancel_action) { @@ -2154,6 +2153,9 @@ namespace Gala { parents = null; moving = null; + switch_workspace_with_gesture = false; + animating_switch_workspace = false; + switch_workspace_completed (); }