monolith

public

Star0

Fork 0

Watch0

232 commits 1 branch 0 tags 0 releases1.5 MiB

Commit `2a9ba5d3d11d`

tarball

atagen <boss@atagen.co>2026-10-19 08:55 UTC

1 file changed+31-15

scene: multiply window alpha by the opacity rule

Windows were only ever drawn at the alpha their transition gave, so config could not dim one. The opacity reaches the surface elements, the effect shader's draw alpha and the border strips, so a window does not pop to full opacity while it spawns.

Modified file: crates/monolith/src/scene.rs+31 additions−15 deletions@@ -169,7 +169,17 @@ pub fn build(
         };
         let effect = anim.effect(id, now);
         let first = out.len();
-        window_elements(&mut out, renderer, &state.window, r, effect, gliding, scale);
+        let opacity = state.rule.opacity.unwrap_or(1.0);
+        window_elements(
+            &mut out,
+            renderer,
+            &state.window,
+            r,
+            effect,
+            gliding,
+            scale,
+            opacity,
+        );
         let clip = framed.then(|| corner_clip(r, deco, scale)).flatten();
         if let Some(clip) = clip {
             clip_window(&mut out, first, clip);
@@ -182,7 +192,7 @@ pub fn build(
             } else {
                 deco.unfocused.0
             };
-            let alpha = effect.map_or(1.0, |e| e.progress);
+            let alpha = effect.map_or(1.0, |e| e.progress) * opacity;
             let borders = &mut state.borders;
             let first = out.len();
             border_elements(&mut out, borders, r, deco, color, alpha, scale);
@@ -219,6 +229,7 @@ fn window_elements(
     effect: Option<Effect>,
     scaled: bool,
     scale: f64,
+    opacity: f32,
 ) {
     let Some(((x, y), (w, h))) = pixels(r, scale) else {
         return;
@@ -227,7 +238,7 @@ fn window_elements(
     let inset = geo.loc.to_physical_precise_round::<_, i32>(scale);
     let drawn: Size<i32, Physical> = geo.size.to_physical_precise_round(scale);
     let loc = Point::<i32, Physical>::from((x - inset.x, y - inset.y));
-    let alpha = effect.map_or(1.0, |e| e.progress);
+    let alpha = effect.map_or(1.0, |e| e.progress) * opacity;
     let elems: Vec<WaylandSurfaceRenderElement<VulkanRenderer>> = match window.toplevel() {
         Some(t) => render_elements_from_surface_tree(
             renderer,
@@ -248,6 +259,7 @@ fn window_elements(
             ((x, y), (w, h)),
             effect,
             scale,
+            opacity,
         );
         return;
     }
@@ -414,6 +426,7 @@ fn effect_elements(
     (at, size): ((i32, i32), (i32, i32)),
     effect: Effect,
     scale: f64,
+    opacity: f32,
 ) {
     let Some(root) = crate::wm::root(window) else {
         return;
@@ -444,14 +457,9 @@ fn effect_elements(
         );
         let bounds = tex.size().to_logical(buffer_scale, transform).to_f64();
         let src = src.to_buffer(f64::from(buffer_scale), transform, &bounds);
-        out.push(Draw::Texture(PlacedTexture::new(
-            &tex,
-            transform,
-            src,
-            at,
-            size,
-            Some(effect),
-        )));
+        let mut placed = PlacedTexture::new(&tex, transform, src, at, size, Some(effect));
+        placed.alpha = opacity;
+        out.push(Draw::Texture(placed));
     }
 }
 
@@ -464,6 +472,7 @@ pub struct PlacedTexture {
     geometry: Rectangle<i32, Physical>,
     transform: Transform,
     effect: Option<Effect>,
+    alpha: f32,
 }
 
 impl PlacedTexture {
@@ -482,6 +491,7 @@ impl PlacedTexture {
             geometry: Rectangle::new(at.into(), size.into()),
             transform,
             effect,
+            alpha: 1.0,
         }
     }
 }
@@ -519,9 +529,15 @@ impl RenderElement<VulkanRenderer> for PlacedTexture {
         _cache: Option<&UserDataMap>,
     ) -> Result<(), monolith_render_vk::Error> {
         match self.effect {
-            Some(effect) => {
-                frame.render_effect(&self.texture, src, dst, damage, self.transform, 1.0, effect)
-            }
+            Some(effect) => frame.render_effect(
+                &self.texture,
+                src,
+                dst,
+                damage,
+                self.transform,
+                self.alpha,
+                effect,
+            ),
             None => frame.render_texture_from_to(
                 &self.texture,
                 src,
@@ -529,7 +545,7 @@ impl RenderElement<VulkanRenderer> for PlacedTexture {
                 damage,
                 opaque_regions,
                 self.transform,
-                1.0,
+                self.alpha,
             ),
         }
     }

monolith

Commit 2a9ba5d3d11d

Commit `2a9ba5d3d11d`