Skip to content

Commit d423d62

Browse files
committed
Fix desktop nudge and cancel
1 parent 7c34a54 commit d423d62

File tree

2 files changed

+4
-15
lines changed

2 files changed

+4
-15
lines changed

src/Gestures/GesturePropertyTransition.vala

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -110,10 +110,6 @@ public class Gala.GesturePropertyTransition : Object {
110110
};
111111

112112
GestureTracker.OnEnd on_animation_end = (percentage, cancel_action, calculated_duration) => {
113-
if (cancel_action) {
114-
return;
115-
}
116-
117113
actor.save_easing_state ();
118114
actor.set_easing_mode (EASE_OUT_QUAD);
119115
actor.set_easing_duration (AnimationsSettings.get_animation_duration (calculated_duration));

src/WindowManager.vala

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -662,20 +662,13 @@ namespace Gala {
662662
var monitor_scale = display.get_monitor_scale (display.get_primary_monitor ());
663663

664664
var nudge_gap = InternalUtils.scale_to_int (NUDGE_GAP, monitor_scale);
665-
float dest = 0;
666-
if (!switch_workspace_with_gesture) {
667-
dest = nudge_gap;
668-
} else {
669-
var workspaces_geometry = InternalUtils.get_workspaces_geometry (display);
670-
dest = workspaces_geometry.width;
671-
}
672665

673-
if (direction == Meta.MotionDirection.RIGHT) {
674-
dest *= -1;
666+
if (direction == RIGHT) {
667+
nudge_gap *= -1;
675668
}
676669

677-
new GesturePropertyTransition (out_group, gesture_tracker, "x", 0f, 0f, dest).start (switch_workspace_with_gesture);
678-
new GesturePropertyTransition (wallpaper, gesture_tracker, "x", 0f, 0f, dest).start (switch_workspace_with_gesture, () => {
670+
new GesturePropertyTransition (out_group, gesture_tracker, "x", 0f, 0f, nudge_gap).start (switch_workspace_with_gesture);
671+
new GesturePropertyTransition (wallpaper, gesture_tracker, "x", 0f, 0f, nudge_gap).start (switch_workspace_with_gesture, () => {
679672
switch_workspace_animation_finished (direction, false, true);
680673
animating_switch_workspace = false;
681674
});

0 commit comments

Comments
 (0)