From 32a5f354d7e76033757a49cb5955f7bfabfe3277 Mon Sep 17 00:00:00 2001 From: Leonhard <106322251+leolost2605@users.noreply.github.com> Date: Thu, 12 Dec 2024 16:26:17 +0100 Subject: [PATCH] Fix cancelling workspace switch gesture (#2148) Co-authored-by: Leo --- src/WindowManager.vala | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/WindowManager.vala b/src/WindowManager.vala index 0819e992..825b11cf 100644 --- a/src/WindowManager.vala +++ b/src/WindowManager.vala @@ -2201,7 +2201,6 @@ namespace Gala { if (!animating_switch_workspace) { return; } - animating_switch_workspace = cancel_action; if (switch_workspace_window_created_id > 0) { disconnect (switch_workspace_window_created_id); @@ -2212,6 +2211,8 @@ namespace Gala { switch_workspace_completed (); } + animating_switch_workspace = cancel_action; + if (cancel_action) { var cancel_direction = (animation_direction == Meta.MotionDirection.LEFT) ? Meta.MotionDirection.RIGHT @@ -2293,8 +2294,7 @@ namespace Gala { } public override void kill_switch_workspace () { - // We don't care about animation direction, we don't want to cancel it, make it nudge so that it doesn't call switch_workspace_completed () - switch_workspace_animation_finished (LEFT, false, true); + end_switch_workspace (); } public override void locate_pointer () {