Fix cancelling workspace switch gesture (#2148)

leolost2605 · lenemter · web-flow · commit 32a5f354d7e7 · 2024-12-12T18:26:17.000+03:00
Co-authored-by: Leo &lt;lenemter@gmail.com&gt;
diff --git 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 () {

Original file line number	Diff line number	Diff line change
`@@ -2201,7 +2201,6 @@ namespace Gala {`
`2201`	`2201`	`if (!animating_switch_workspace) {`
`2202`	`2202`	`return;`
`2203`	`2203`	`}`
`2204`		`- animating_switch_workspace = cancel_action;`
`2205`	`2204`
`2206`	`2205`	`if (switch_workspace_window_created_id > 0) {`
`2207`	`2206`	`disconnect (switch_workspace_window_created_id);`
`@@ -2212,6 +2211,8 @@ namespace Gala {`
`2212`	`2211`	`switch_workspace_completed ();`
`2213`	`2212`	`}`
`2214`	`2213`
	`2214`	`+ animating_switch_workspace = cancel_action;`
	`2215`	`+`
`2215`	`2216`	`if (cancel_action) {`
`2216`	`2217`	`var cancel_direction = (animation_direction == Meta.MotionDirection.LEFT)`
`2217`	`2218`	`? Meta.MotionDirection.RIGHT`
`@@ -2293,8 +2294,7 @@ namespace Gala {`
`2293`	`2294`	`}`
`2294`	`2295`
`2295`	`2296`	`public override void kill_switch_workspace () {`
`2296`		`- // 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 ()`
`2297`		`- switch_workspace_animation_finished (LEFT, false, true);`
	`2297`	`+ end_switch_workspace ();`
`2298`	`2298`	`}`
`2299`	`2299`
`2300`	`2300`	`public override void locate_pointer () {`