Implement window closing animations

2 files changed, 17 insertions, 2 deletions

diff --git a/src/handlers/compositor.rs b/src/handlers/compositor.rs
index 9b164865..2e657151 100644
--- a/src/handlers/compositor.rs
+++ b/src/handlers/compositor.rs
@@ -187,8 +187,6 @@ impl CompositorHandler for State {
                 let window = mapped.window.clone();
                 let output = output.clone();
 
-                window.on_commit();
-
                 // This is a commit of a previously-mapped toplevel.
                 let is_mapped =
                     with_renderer_surface_state(surface, |state| state.buffer().is_some())
@@ -197,6 +195,17 @@ impl CompositorHandler for State {
                             false
                         });
 
+                // Must start the close animation before window.on_commit().
+                if !is_mapped {
+                    self.backend.with_primary_renderer(|renderer| {
+                        self.niri
+                            .layout
+                            .start_close_animation_for_window(renderer, &window);
+                    });
+                }
+
+                window.on_commit();
+
                 if !is_mapped {
                     // The toplevel got unmapped.
                     //
diff --git a/src/handlers/xdg_shell.rs b/src/handlers/xdg_shell.rs
index c31c6404..2cbaad25 100644
--- a/src/handlers/xdg_shell.rs
+++ b/src/handlers/xdg_shell.rs
@@ -382,6 +382,12 @@ impl XdgShellHandler for State {
         let window = mapped.window.clone();
         let output = output.clone();
 
+        self.backend.with_primary_renderer(|renderer| {
+            self.niri
+                .layout
+                .start_close_animation_for_window(renderer, &window);
+        });
+
         let active_window = self.niri.layout.active_window().map(|(m, _)| &m.window);
         let was_active = active_window == Some(&window);