Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions lib/CloseButton.vala
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ public class Gala.CloseButton : Clutter.Actor {
}

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

pixbuf_actor.save_easing_state ();
pixbuf_actor.set_easing_duration (estimated_duration);
Expand Down Expand Up @@ -111,7 +111,7 @@ public class Gala.CloseButton : Clutter.Actor {
}

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

pixbuf_actor.save_easing_state ();
pixbuf_actor.set_easing_duration (estimated_duration);
Expand Down
20 changes: 8 additions & 12 deletions src/WindowManager.vala
Original file line number Diff line number Diff line change
Expand Up @@ -975,24 +975,20 @@ namespace Gala {
unowned Meta.WindowActor window_actor = window.get_compositor_private () as Meta.WindowActor;
window_group.set_child_below_sibling (tile_preview, window_actor);

var duration = AnimationDuration.SNAP / 2U;
var duration = Utils.get_animation_duration (AnimationDuration.SNAP / 2U);

var rect = window.get_frame_rect ();
tile_preview.set_position (rect.x, rect.y);
tile_preview.set_size (rect.width, rect.height);
tile_preview.show ();

if (Meta.Prefs.get_gnome_animations ()) {
tile_preview.save_easing_state ();
tile_preview.set_easing_mode (Clutter.AnimationMode.EASE_IN_OUT_QUAD);
tile_preview.set_easing_duration (duration);
tile_preview.opacity = 255U;
tile_preview.set_position (tile_rect.x, tile_rect.y);
tile_preview.set_size (tile_rect.width, tile_rect.height);
tile_preview.restore_easing_state ();
} else {
tile_preview.opacity = 255U;
}
tile_preview.save_easing_state ();
tile_preview.set_easing_mode (Clutter.AnimationMode.EASE_IN_OUT_QUAD);
tile_preview.set_easing_duration (duration);
tile_preview.opacity = 255U;
tile_preview.set_position (tile_rect.x, tile_rect.y);
tile_preview.set_size (tile_rect.width, tile_rect.height);
tile_preview.restore_easing_state ();
}

public override void hide_tile_preview () {
Expand Down