Feat/layer anims by Atan-D-RP4 · Pull Request #3481 · niri-wm/niri

Atan-D-RP4 · 2026-02-20T16:57:03Z

Implements layer animations.
There is surprisingly no open issue for this. Just a couple discussions.

260220_23h27m11s_recording.mp4

YaLTeR

Haven't looked through in detail

src/backend/tty.rs

YaLTeR · 2026-02-21T20:22:37Z

src/handlers/layer_shell.rs

+            if let Some((_, mut mapped)) = self.niri.closing_layers.remove(layer) {
+                mapped.clear_close_animation();
+                mapped.start_open_animation(&config.animations);


I think it would make more sense for it to work like closing windows work where they are not tied in any way to a Mapped. It would remove this sort of juggling.

YaLTeR · 2026-02-21T20:23:20Z

src/layer/closing_layer.rs

+use crate::render_helpers::{render_to_encompassing_texture, RenderTarget};
+
+#[derive(Debug)]
+pub struct ClosingLayer {


This is pretty much exactly the same as ClosingWindow, maybe they could be somehow combined together?

Yeah, this and opening_layer.rs, I directly copied from window stuff. Combining them together would be more architectural change, and I didn't think it appropriate for this PR.

YaLTeR · 2026-02-21T20:23:38Z

src/layer/mapped.rs

+    pub closing_layer: Option<ClosingLayer>,
+
+    /// Cached render elements for close animation (captured on last commit before close).
+    cached_close_elements: Option<CachedCloseElements>,


This is called "unmap snapshot" for windows, let's keep the terminology

YaLTeR · 2026-02-21T20:24:14Z

src/layer/mapped.rs

            let buf_pos = location;
-
            let surface = self.surface.wl_surface();
+


Unrelated changes

YaLTeR · 2026-02-21T20:29:08Z

src/handlers/layer_shell.rs

+                    push_elements_from_surface_tree(
+                        renderer,
+                        surface,
+                        Point::from((0., 0.)).to_physical_precise_round(scale),
+                        scale,
+                        alpha,
+                        Kind::ScanoutCandidate,
+                        &mut |elem| contents.push(elem),
+                    );
+
+                    let mut blocked_out_contents = Vec::new();
+                    push_elements_from_surface_tree(
+                        renderer,
+                        surface,
+                        Point::from((0., 0.)).to_physical_precise_round(scale),
+                        scale,
+                        alpha,
+                        Kind::ScanoutCandidate,
+                        &mut |elem| blocked_out_contents.push(elem),
+                    );


This stuff duplicated in 2 places likely needs to go into a separate function called store_unmap_snapshot() (see how window Mapped does it)

Already done in a local commit.

YaLTeR · 2026-02-21T20:30:05Z

src/layer/mapped.rs

+        // Blocked out layers fall back to normal rendering
+        if target.should_block_out(self.rules.block_out_from) {
+            return false;
+        }


Why? Blocked-out tiles get rendered with anims, layers should too

I think I got the wrong idea from render_popups(). I also don't use screensharing+block-out-from much so I didn't notice.

YaLTeR · 2026-02-21T20:33:41Z

src/handlers/layer_shell.rs

+                            Kind::ScanoutCandidate,
+                            &mut |elem| contents.push(elem),
+                        );
+


So the logic here is to store a snapshot of contents at first commit to use if the surface is destroyed without unmapping? That's kinda weird tbh, those contents are way out of date by then. And anyhow this shouldn't be a problem I think if you store unmap snapshot in CompositorHandler::destroyed() just like regular windows do

YaLTeR · 2026-02-21T20:34:09Z

src/handlers/layer_shell.rs

+            // The surface is unmapped. Capture elements now (while surface still has content)
+            // and add to closing_layers for animation rendering.


And this needs to be in pre-commit hook I believe (just like normal windows unmap snapshot)

niri-config/src/animations.rs

Atan-D-RP4 · 2026-02-24T05:48:41Z

Alright everything seems to work.

260224_11h17m05s_recording.mp4

HigherOrderLogic · 2026-02-24T05:54:36Z

Looks like the SwayNC panel has a faint overlay during close animation.

Atan-D-RP4 · 2026-02-24T06:49:38Z

That's just how SwayNC does it. I tested it on Hyprland, and it's there as well.

Atan-D-RP4 · 2026-02-24T08:33:48Z

Test config for anyone looking to review this and new config design:

animations {
    layer-open {
        duration-ms 700
        curve "cubic-bezier" 0.05 0.7 0.1 1 // CSS cubic-bezier curve

        // fade in, no movement
        custom-shader r"
            vec4 open_color(vec3 coords_geo, vec3 size_geo) {
                vec3 coords_tex = niri_geo_to_tex * coords_geo;
                vec4 color = texture2D(niri_tex, coords_tex.st);
                color *= niri_clamped_progress;
                return color;
            }
        "
    }

    layer-close {
        // base fallback close (wallpaper, and any bucket without overrides)
        duration-ms 900
        curve "cubic-bezier" 0.05 0.7 0.1 1

        // fade out, no movement
        custom-shader r"
            vec4 close_color(vec3 coords_geo, vec3 size_geo) {
                // Geometry-space y coordinate of output bottom edge.
                float bottom_geo = (niri_input_to_geo * vec3(0.0, 1.0, 1.0)).y;
                vec3 coords = coords_geo;
                coords.y -= niri_clamped_progress * bottom_geo;
                vec3 coords_tex = niri_geo_to_tex * coords;
                vec4 color = texture2D(niri_tex, coords_tex.st);
                if (coords_tex.x < 0.0 || coords_tex.x > 1.0 ||
                    coords_tex.y < 0.0 || coords_tex.y > 1.0) {
                    color = vec4(0.0);
                }
                return color;
            }
        "
    }


    layer-launcher-open {
        // distinct long launcher open
        duration-ms 2400
        curve "cubic-bezier" 0.05 0.7 0.1 1

        // slide in from left with fade
        custom-shader r"
            vec4 open_color(vec3 coords_geo, vec3 size_geo) {
                // Geometry-space x coordinate of output left edge.
                float left_geo = (niri_input_to_geo * vec3(1.0, 0.0, 1.0)).x;
                vec3 coords = coords_geo;
                coords.x += (1.0 - niri_clamped_progress) * left_geo;
                vec3 coords_tex = niri_geo_to_tex * coords;
                vec4 color = texture2D(niri_tex, coords_tex.st);
                if (coords_tex.x < 0.0 || coords_tex.x > 1.0 ||
                    coords_tex.y < 0.0 || coords_tex.y > 1.0) {
                    color = vec4(0.0);
                }
                color *= niri_clamped_progress;
                return color;
            }
        "
    }

    layer-launcher-close {
        // distinct long launcher close
        duration-ms 2600
        curve "cubic-bezier" 0.05 0.7 0.1 1
        // slide out to right with fade
        custom-shader r"
            vec4 close_color(vec3 coords_geo, vec3 size_geo) {
                // Geometry-space x coordinate of output right edge.
                float right_geo = (niri_input_to_geo * vec3(1.0, 0.0, 1.0)).x;
                vec3 coords = coords_geo;
                coords.x -= niri_clamped_progress * right_geo;
                vec3 coords_tex = niri_geo_to_tex * coords;
                vec4 color = texture2D(niri_tex, coords_tex.st);
                if (coords_tex.x < 0.0 || coords_tex.x > 1.0 ||
                    coords_tex.y < 0.0 || coords_tex.y > 1.0) {
                    color = vec4(0.0);
                }
                color *= (1.0 - niri_clamped_progress);
                return color;
            }
        "
    }

    layer-bar-open {
        // bar open distinct but shorter than launcher
        duration-ms 1800
        curve "cubic-bezier" 0.05 0.7 0.1 1
        // slide in from left
        custom-shader r"
            vec4 open_color(vec3 coords_geo, vec3 size_geo) {
                // Geometry-space x coordinate of output right edge.
                float right_geo = (niri_input_to_geo * vec3(1.0, 0.0, 1.0)).x;
                vec3 coords = coords_geo;
                coords.x -= (1.0 - niri_clamped_progress) * right_geo;
                vec3 coords_tex = niri_geo_to_tex * coords;
                vec4 color = texture2D(niri_tex, coords_tex.st);
                if (coords_tex.x < 0.0 || coords_tex.x > 1.0 ||
                    coords_tex.y < 0.0 || coords_tex.y > 1.0) {
                    color = vec4(0.0);
                }
                return color;
            }
        "
    }

    layer-bar-close {
        duration-ms 3200
        curve "cubic-bezier" 0.05 0.7 0.1 1

        // slide out to right
        custom-shader r"
            vec4 close_color(vec3 coords_geo, vec3 size_geo) {
                float right_geo = (niri_input_to_geo * vec3(1.0, 0.0, 1.0)).x;
                vec3 coords = coords_geo;
                coords.x += niri_clamped_progress * right_geo;
                vec3 coords_tex = niri_geo_to_tex * coords;
                vec4 color = texture2D(niri_tex, coords_tex.st);
                if (coords_tex.x < 0.0 || coords_tex.x > 1.0 ||
                    coords_tex.y < 0.0 || coords_tex.y > 1.0) {
                    color = vec4(0.0);
                }
                return color;
            }
        "
    }

    layer-wallpaper-open {
        duration-ms 2000
        curve "cubic-bezier" 0.05 0.7 0.1 1

        // slide in from left
        custom-shader r"
            vec4 open_color(vec3 coords_geo, vec3 size_geo) {
                // Geometry-space x coordinate of output right edge.
                float right_geo = (niri_input_to_geo * vec3(1.0, 0.0, 1.0)).x;
                vec3 coords = coords_geo;
                coords.x -= (1.0 - niri_clamped_progress) * right_geo;
                vec3 coords_tex = niri_geo_to_tex * coords;
                vec4 color = texture2D(niri_tex, coords_tex.st);
                if (coords_tex.x < 0.0 || coords_tex.x > 1.0 ||
                    coords_tex.y < 0.0 || coords_tex.y > 1.0) {
                    color = vec4(0.0);
                }
                return color;
            }
        "
    }

    layer-wallpaper-close {
        duration-ms 2000
        curve "cubic-bezier" 0.05 0.7 0.1 1

        // slide out to right
        custom-shader r"
            vec4 close_color(vec3 coords_geo, vec3 size_geo) {
                float right_geo = (niri_input_to_geo * vec3(1.0, 0.0, 1.0)).x;
                vec3 coords = coords_geo;
                coords.x += niri_clamped_progress * right_geo;
                vec3 coords_tex = niri_geo_to_tex * coords;
                vec4 color = texture2D(niri_tex, coords_tex.st);
                if (coords_tex.x < 0.0 || coords_tex.x > 1.0 ||
                    coords_tex.y < 0.0 || coords_tex.y > 1.0) {
                    color = vec4(0.0);
                }
                return color;
            }
        "
    }
}

HigherOrderLogic · 2026-02-26T13:37:19Z

I'm not sure if I like the layer-(bar|launcher|wallpaper|whatever-(open|close) config design. Is there any rationale behind this?

I would prefer if it just use the usual layer-rules block and matchers.

Atan-D-RP4 · 2026-02-27T03:29:11Z

I'm not sure if I like the layer-(bar|launcher|wallpaper|whatever-(open|close) config design. Is there any rationale behind this?

Neither do I.

But Yalter mentioned wanting to see if such a design, with it's backing heuristic, was possible to do relatively painlessly over on matrix.

It is not as painless as desired. We'll see which parts we can keep and which to throw out.

I would prefer if it just use the usual layer-rules block and matchers.

That'll have to wait for animations block support in window-rules.

YaLTeR · 2026-02-27T04:57:37Z

I'm not sure if I like the layer-(bar|launcher|wallpaper|whatever-(open|close) config design. Is there any rationale behind this?

Feat/layer anims #3481 (comment)
Our goal here is to have the sensible behavior by default (i.e. bars use bar anim, launchers use launcher anim), then make it easy to override common cases (i.e. someone wants to leave bar anims but disable launcher anims), then make it possible to override per client (i.e. current layer rules with namespace -- this should be the last resort as it's the least general way). All of this filtered through what is technically feasible without hacks (i.e. if it turns out that we can't make robust heuristics then we don't do them).

Atan-D-RP4 · 2026-02-27T05:06:43Z

Feat/layer anims #3481 (comment)

I already replied to that thread but it was me doing something AI suggested, to make the open anim work.
Turns out I'd just been dropping the offscreen data instead of rendering it into a texture and using that.
Already cleaned up.

YaLTeR · 2026-02-27T05:34:09Z

I was just linking the rationale

Atan-D-RP4 force-pushed the feat/layer-anims branch 6 times, most recently from 13420bf to c42db0f Compare February 21, 2026 20:43

YaLTeR requested changes Feb 21, 2026

View reviewed changes

Atan-D-RP4 force-pushed the feat/layer-anims branch from c42db0f to b94f028 Compare February 24, 2026 05:37

Atan-D-RP4 added 10 commits February 24, 2026 11:07

config boilerplate

23e01cd

layer open/close modules in layer module

491193e

initial wiring

bc09a75

more config boilerplate

cb2e57d

full wiring

1a09ca9

more boilerplate

b7161c1

finally it seems to work

ddd548f

cleanup

ddff21e

fix open animation by wiring the offscreen_data tracking properly

c942e49

fix for swaync

1affc8e

Atan-D-RP4 force-pushed the feat/layer-anims branch from b94f028 to 1affc8e Compare February 24, 2026 05:37

Atan-D-RP4 force-pushed the feat/layer-anims branch from 9abd9ae to 8091e58 Compare February 24, 2026 08:56

Atan-D-RP4 added 2 commits February 26, 2026 01:42

clean up unneccessary differences between layer and window anims

6cae9c0

so much boilerplate good god

4499c6c

Atan-D-RP4 force-pushed the feat/layer-anims branch from 8091e58 to 4499c6c Compare February 25, 2026 20:14

titaniumtraveler and others added 2 commits March 5, 2026 01:10

winit: add an app-id when running niri in nested mode in nested mode

0731019

simplyify the boilerplate and some other corrections

9c83d6b

		let buf_pos = location;

		let surface = self.surface.wl_surface();

		// The surface is unmapped. Capture elements now (while surface still has content)
		// and add to closing_layers for animation rendering.

Uh oh!

Conversation

Atan-D-RP4 commented Feb 20, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

YaLTeR left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Atan-D-RP4 commented Feb 24, 2026

Uh oh!

HigherOrderLogic commented Feb 24, 2026

Uh oh!

Atan-D-RP4 commented Feb 24, 2026

Uh oh!

Atan-D-RP4 commented Feb 24, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

HigherOrderLogic commented Feb 26, 2026

Uh oh!

Atan-D-RP4 commented Feb 27, 2026

Uh oh!

YaLTeR commented Feb 27, 2026

Uh oh!

Atan-D-RP4 commented Feb 27, 2026

Uh oh!

YaLTeR commented Feb 27, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

Atan-D-RP4 commented Feb 20, 2026 •

edited

Loading

Atan-D-RP4 commented Feb 24, 2026 •

edited

Loading