diff options
| author | Ivan Molodetskikh <yalterz@gmail.com> | 2025-09-20 12:57:40 +0300 |
|---|---|---|
| committer | Ivan Molodetskikh <yalterz@gmail.com> | 2025-10-02 09:33:08 +0300 |
| commit | 2781d3a74338806f631acda99e9f702b1b59a3e6 (patch) | |
| tree | b7066f8476fe2ba0b18b961c0360001070ec54cb /src/layer/mapped.rs | |
| parent | e739ce8171705dd0b87c317cc0f4509b7f16f6df (diff) | |
| download | niri-2781d3a74338806f631acda99e9f702b1b59a3e6.tar.gz niri-2781d3a74338806f631acda99e9f702b1b59a3e6.tar.bz2 niri-2781d3a74338806f631acda99e9f702b1b59a3e6.zip | |
config: Replace resolve_against with MergeWith
Diffstat (limited to 'src/layer/mapped.rs')
| -rw-r--r-- | src/layer/mapped.rs | 5 |
1 files changed, 3 insertions, 2 deletions
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); } |