From 2781d3a74338806f631acda99e9f702b1b59a3e6 Mon Sep 17 00:00:00 2001
From: Ivan Molodetskikh <yalterz@gmail.com>
Date: Sat, 20 Sep 2025 12:57:40 +0300
Subject: config: Replace resolve_against with MergeWith

---
 src/layer/mapped.rs | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'src/layer')

diff --git a/src/layer/mapped.rs b/src/layer/mapped.rs
index b12906b2..658a0c15 100644
--- a/src/layer/mapped.rs
+++ b/src/layer/mapped.rs
@@ -1,3 +1,4 @@
+use niri_config::utils::MergeWith as _;
 use niri_config::{Config, LayerRule};
 use smithay::backend::renderer::element::surface::{
     render_elements_from_surface_tree, WaylandSurfaceRenderElement,
@@ -61,7 +62,7 @@ impl MappedLayer {
         let mut shadow_config = config.layout.shadow;
         // Shadows for layer surfaces need to be explicitly enabled.
         shadow_config.on = false;
-        let shadow_config = rules.shadow.resolve_against(shadow_config);
+        shadow_config.merge_with(&rules.shadow);
 
         Self {
             surface,
@@ -78,7 +79,7 @@ impl MappedLayer {
         let mut shadow_config = config.layout.shadow;
         // Shadows for layer surfaces need to be explicitly enabled.
         shadow_config.on = false;
-        let shadow_config = self.rules.shadow.resolve_against(shadow_config);
+        shadow_config.merge_with(&self.rules.shadow);
         self.shadow.update_config(shadow_config);
     }
 
-- 
cgit