From 1f94db16c627f73af5dc69714611815e4691b5e8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Danielle=20For=C3=A9?= Date: Tue, 24 May 2022 02:11:51 +0000 Subject: [PATCH] WindowManager: save/restore easing on workspace switch (#1430) --- src/WindowManager.vala | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/src/WindowManager.vala b/src/WindowManager.vala index 91dbaeab..dfed3d9b 100644 --- a/src/WindowManager.vala +++ b/src/WindowManager.vala @@ -1965,10 +1965,15 @@ namespace Gala { ? calculated_duration : AnimationDuration.WORKSPACE_SWITCH_MIN; + out_group.save_easing_state (); out_group.set_easing_mode (animation_mode); out_group.set_easing_duration (duration); + + in_group.save_easing_state (); in_group.set_easing_mode (animation_mode); in_group.set_easing_duration (duration); + + wallpaper_clone.save_easing_state (); wallpaper_clone.set_easing_mode (animation_mode); wallpaper_clone.set_easing_duration (duration); @@ -1977,12 +1982,17 @@ namespace Gala { wallpaper.set_easing_duration (duration); out_group.x = cancel_action ? 0.0f : x2; + out_group.restore_easing_state (); + in_group.x = cancel_action ? -x2 : 0.0f; + in_group.restore_easing_state (); wallpaper.x = cancel_action ? 0.0f : x2; - wallpaper_clone.x = cancel_action ? -x2 : 0.0f; wallpaper.restore_easing_state (); + wallpaper_clone.x = cancel_action ? -x2 : 0.0f; + wallpaper_clone.restore_easing_state (); + var transition = in_group.get_transition ("x"); if (transition != null) { transition.completed.connect (() => {