Skip to content

Commit 91e65ff

Browse files
authored
Fix several interactions with disabled animations (#2622)
1 parent 2093875 commit 91e65ff

File tree

2 files changed

+10
-14
lines changed

2 files changed

+10
-14
lines changed

lib/CloseButton.vala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ public class Gala.CloseButton : Clutter.Actor {
7979
}
8080

8181
public override bool button_press_event (Clutter.Event e) {
82-
var estimated_duration = (uint) (ANIMATION_DURATION * (scale_x - 0.8) / 0.2);
82+
var estimated_duration = Utils.get_animation_duration ((uint) (ANIMATION_DURATION * (scale_x - 0.8) / 0.2));
8383

8484
pixbuf_actor.save_easing_state ();
8585
pixbuf_actor.set_easing_duration (estimated_duration);
@@ -111,7 +111,7 @@ public class Gala.CloseButton : Clutter.Actor {
111111
}
112112

113113
private void reset_scale () {
114-
var estimated_duration = (uint) (ANIMATION_DURATION * (1.0 - scale_x) / 0.2);
114+
var estimated_duration = Utils.get_animation_duration ((uint) (ANIMATION_DURATION * (1.0 - scale_x) / 0.2));
115115

116116
pixbuf_actor.save_easing_state ();
117117
pixbuf_actor.set_easing_duration (estimated_duration);

src/WindowManager.vala

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -975,24 +975,20 @@ namespace Gala {
975975
unowned Meta.WindowActor window_actor = window.get_compositor_private () as Meta.WindowActor;
976976
window_group.set_child_below_sibling (tile_preview, window_actor);
977977

978-
var duration = AnimationDuration.SNAP / 2U;
978+
var duration = Utils.get_animation_duration (AnimationDuration.SNAP / 2U);
979979

980980
var rect = window.get_frame_rect ();
981981
tile_preview.set_position (rect.x, rect.y);
982982
tile_preview.set_size (rect.width, rect.height);
983983
tile_preview.show ();
984984

985-
if (Meta.Prefs.get_gnome_animations ()) {
986-
tile_preview.save_easing_state ();
987-
tile_preview.set_easing_mode (Clutter.AnimationMode.EASE_IN_OUT_QUAD);
988-
tile_preview.set_easing_duration (duration);
989-
tile_preview.opacity = 255U;
990-
tile_preview.set_position (tile_rect.x, tile_rect.y);
991-
tile_preview.set_size (tile_rect.width, tile_rect.height);
992-
tile_preview.restore_easing_state ();
993-
} else {
994-
tile_preview.opacity = 255U;
995-
}
985+
tile_preview.save_easing_state ();
986+
tile_preview.set_easing_mode (Clutter.AnimationMode.EASE_IN_OUT_QUAD);
987+
tile_preview.set_easing_duration (duration);
988+
tile_preview.opacity = 255U;
989+
tile_preview.set_position (tile_rect.x, tile_rect.y);
990+
tile_preview.set_size (tile_rect.width, tile_rect.height);
991+
tile_preview.restore_easing_state ();
996992
}
997993

998994
public override void hide_tile_preview () {

0 commit comments

Comments
 (0)