Added animation for closing windows.

This will add animations for windows when closing (destroying) just like it works for unmapping (e.g. minimizing).
pijulius · Oct 19, 2021 · 7b674f9 · 7b674f9
1 parent b92d410
commit 7b674f9
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 5 deletions.
diff --git a/src/picom.c b/src/picom.c
@@ -794,7 +794,9 @@ paint_preprocess(session_t *ps, bool *fade_running, bool *animation_running) {
 				pixman_region32_init_rect(&w->bounding_shape, 0, 0,
 											(uint)w->widthb, (uint)w->heightb);
 
-				win_clear_flags(w, WIN_FLAGS_PIXMAP_STALE);
+				if (w->state != WSTATE_DESTROYING)
+					win_clear_flags(w, WIN_FLAGS_PIXMAP_STALE);
+
 				win_process_image_flags(ps, w);
 			}
 			// Mark new window region with damage
@@ -878,7 +880,7 @@ paint_preprocess(session_t *ps, bool *fade_running, bool *animation_running) {
 		}
 	}
 
-	if (animation_running)
+	if (*animation_running)
 		ps->animation_time = now;
 
 	// Opacity will not change, from now on.
@@ -907,7 +909,10 @@ paint_preprocess(session_t *ps, bool *fade_running, bool *animation_running) {
 		if (w->state == WSTATE_UNMAPPED ||
 		    unlikely(w->base.id == ps->debug_window ||
 		             w->client_win == ps->debug_window)) {
-			to_paint = false;
+
+			if (!*fade_running || w->opacity == w->opacity_target)
+				to_paint = false;
+
 		} else if (!w->ever_damaged && w->state != WSTATE_UNMAPPING &&
 		           w->state != WSTATE_DESTROYING) {
 			// Unmapping clears w->ever_damaged, but the fact that the window

diff --git a/src/win.c b/src/win.c
@@ -1468,7 +1468,9 @@ void win_on_win_size_change(session_t *ps, struct managed_win *w) {
 	       w->state != WSTATE_UNMAPPING);
 
 	// Invalidate the shadow we built
-	win_set_flags(w, WIN_FLAGS_IMAGES_STALE);
+	if (w->state != WSTATE_DESTROYING)
+		win_set_flags(w, WIN_FLAGS_IMAGES_STALE);
+
 	ps->pending_updates = true;
 	free_paint(ps, &w->shadow_paint);
 }
@@ -3109,5 +3111,5 @@ win_stack_find_next_managed(const session_t *ps, const struct list_node *i) {
 bool win_is_mapped_in_x(const struct managed_win *w) {
 	return w->state == WSTATE_MAPPING || w->state == WSTATE_FADING ||
 	       w->state == WSTATE_MAPPED || w->state == WSTATE_UNMAPPING ||
-	       (w->flags & WIN_FLAGS_MAPPED);
+	       w->state == WSTATE_DESTROYING || (w->flags & WIN_FLAGS_MAPPED);
 }