diff --git a/config.def.h b/config.def.h index b66da319..510c462a 100644 --- a/config.def.h +++ b/config.def.h @@ -10,11 +10,9 @@ static const bool animations = true; // Enable animations static const char *animation_type = "slide"; //slide or zoom static const char animation_fade_in = 0; // Enable animation fade in static const float zoom_initial_ratio = 0.5; // Initial window ratio for animations -static const float fadeout_begin_opacity = 1; // Begin opacity for animations fadeout static const float fadein_begin_opacity = 0; // Begin opacity for animations fasdein static const uint32_t animation_duration_move = 300; // Animation move speed static const uint32_t animation_duration_open = 300; // Animation open speed -static const uint32_t animation_duration_close = 200; // Animation close speed static const uint32_t animation_duration_tag = 300; // Animation tag speed // static const double animation_curve[4] = {0.05,0.9,0.1,1.05}; // Animation curve static const double animation_curve[4] = {0.46,1.0,0.29,0.99}; // Animation curve diff --git a/main.c b/main.c index 617c7a24..aabaf0b9 100644 --- a/main.c +++ b/main.c @@ -744,10 +744,6 @@ bool client_animation_next_tick(Client *c) { client_set_opacity(c, MIN(animation_passed + fadein_begin_opacity, 1.0)); } - if (c->iskilling) { - client_set_opacity(c, MAX(fadeout_begin_opacity - animation_passed, 0.1)); - } - c->is_open_animation = false; if (animation_passed == 1.0) { @@ -3758,9 +3754,7 @@ void resize(Client *c, struct wlr_box geo, int interact) { client_set_opacity(c, 1); } - if (c->iskilling) { - c->animation.duration = animation_duration_close; - } else if (c->animation.tagouting) { + if (c->animation.tagouting) { c->animation.duration = animation_duration_tag; } else if (c->animation.tagining) { c->animation.duration = animation_duration_tag;