pogmommy/swayfx
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fixed fade-in delay

Browse source
This commit is contained in:
William McKinnon 2023-08-21 15:26:09 -04:00
parent 87f33da112
commit 638373120b
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
sway/tree/container.c
View file

@ -32,16 +32,16 @@
// TODO signal instead of timer? // TODO signal instead of timer?
// TODO determine return val // TODO determine return val
// TODO no longer need output->refresh sec? // TODO no longer need output->refresh_sec?
// TODO better timing // TODO better timing
static int animation_timer(void *data) { static int animation_timer(void *data) {
struct sway_container *con = data; struct sway_container *con = data;
unsigned int fastest_output_refresh_ns = 0; float fastest_output_refresh_s = 0;
bool is_closing = con->alpha > con->target_alpha; bool is_closing = con->alpha > con->target_alpha;
for (int i = 0; i < con->outputs->length; ++i) { for (int i = 0; i < con->outputs->length; ++i) {
struct sway_output *output = root->outputs->items[i]; struct sway_output *output = root->outputs->items[i];
fastest_output_refresh_ns = MAX(fastest_output_refresh_ns, output->refresh_nsec); fastest_output_refresh_s = MAX(fastest_output_refresh_s, output->refresh_sec);
float alpha_step = config->animation_duration ? float alpha_step = config->animation_duration ?
(con->max_alpha * output->refresh_sec) / config->animation_duration : con->max_alpha; (con->max_alpha * output->refresh_sec) / config->animation_duration : con->max_alpha;
con->alpha = is_closing ? MAX(con->alpha - alpha_step, con->target_alpha) : con->alpha = is_closing ? MAX(con->alpha - alpha_step, con->target_alpha) :
@ -49,7 +49,7 @@ static int animation_timer(void *data) {
} }
if (con->alpha != con->target_alpha) { if (con->alpha != con->target_alpha) {
wl_event_source_timer_update(con->animation_present_timer, fastest_output_refresh_ns / 1000000); wl_event_source_timer_update(con->animation_present_timer, fastest_output_refresh_s * 1000);
} else if (is_closing && con->view->impl->close) { } else if (is_closing && con->view->impl->close) {
con->view->impl->close(con->view); con->view->impl->close(con->view);
} }
@ -87,8 +87,8 @@ struct sway_container *container_create(struct sway_view *view) {
c->animation_present_timer = wl_event_loop_add_timer(server.wl_event_loop, c->animation_present_timer = wl_event_loop_add_timer(server.wl_event_loop,
animation_timer, c); animation_timer, c);
// TODO: pass 0 instead of animation_duration_msec? // TODO: WON'T SPAWN IF LESS THAN 50, get optimal time (or use a signal?)
wl_event_source_timer_update(c->animation_present_timer, 1000); wl_event_source_timer_update(c->animation_present_timer, 50);
wl_signal_emit_mutable(&root->events.new_node, &c->node); wl_signal_emit_mutable(&root->events.new_node, &c->node);