Skip to content

Fix cancelling workspace switch gesture #2148

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Dec 12, 2024
Merged

Fix cancelling workspace switch gesture #2148

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
294a3b8
Fix cancelling workspace switch gesture
leolost2605 Dec 7, 2024
8b04e7d
Merge branch 'main' into leolost/fix-cancel-workspace-animation-gesture
lenemter Dec 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/WindowManager.vala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -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
Expand Down Expand Up @@ -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 () {
Expand Down
Loading