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

fixed con kill issue

Browse source
This commit is contained in:
William McKinnon 2023-08-09 01:07:49 -04:00
parent 3cb407e65c
commit 07665971dc
1 changed files with 2 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
sway/tree/container.c
View file

@ -40,16 +40,14 @@ static int animation_timer(void *data) {
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_ns = MAX(fastest_output_refresh_ns, output->refresh_nsec);
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 = con->alpha < con->target_alpha ? MIN(con->alpha + alpha_step, con->target_alpha) con->alpha = con->alpha < con->target_alpha ? MIN(con->alpha + alpha_step, con->target_alpha)
: MAX(con->alpha - alpha_step, con->target_alpha); : MAX(con->alpha - alpha_step, con->target_alpha);
} }
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_ns / 1000000);
} else {
wl_event_source_remove(con->animation_present_timer);
} }
container_damage_whole(con); container_damage_whole(con);
@ -121,9 +119,7 @@ void container_destroy(struct sway_container *con) {
wlr_texture_destroy(con->marks_urgent); wlr_texture_destroy(con->marks_urgent);
wlr_texture_destroy(con->marks_focused_tab_title); wlr_texture_destroy(con->marks_focused_tab_title);
if (con->animation_present_timer) { wl_event_source_remove(con->animation_present_timer);
wl_event_source_remove(con->animation_present_timer);
}
if (con->view && con->view->container == con) { if (con->view && con->view->container == con) {
con->view->container = NULL; con->view->container = NULL;