diff options
| author | Ivan Molodetskikh <yalterz@gmail.com> | 2025-09-20 12:57:38 +0300 |
|---|---|---|
| committer | Ivan Molodetskikh <yalterz@gmail.com> | 2025-10-02 09:33:08 +0300 |
| commit | a2727ba2c9cfb22e4184235c6dfd8d8819328169 (patch) | |
| tree | dbde396598e3ac3483d8535ea62c2994ef2bbf70 /src | |
| parent | 8df6231cc164396e19a892f11beb8c02e2e88efb (diff) | |
| download | niri-a2727ba2c9cfb22e4184235c6dfd8d8819328169.tar.gz niri-a2727ba2c9cfb22e4184235c6dfd8d8819328169.tar.bz2 niri-a2727ba2c9cfb22e4184235c6dfd8d8819328169.zip | |
config: Introduce MergeWith trait
Diffstat (limited to 'src')
| -rw-r--r-- | src/layer/mod.rs | 1 | ||||
| -rw-r--r-- | src/window/mod.rs | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/src/layer/mod.rs b/src/layer/mod.rs index 2ff8b7ca..19a091c1 100644 --- a/src/layer/mod.rs +++ b/src/layer/mod.rs @@ -1,4 +1,5 @@ use niri_config::layer_rule::{LayerRule, Match}; +use niri_config::utils::MergeWith as _; use niri_config::{BlockOutFrom, CornerRadius, ShadowRule}; use smithay::desktop::LayerSurface; diff --git a/src/window/mod.rs b/src/window/mod.rs index b07b80d8..c65fa535 100644 --- a/src/window/mod.rs +++ b/src/window/mod.rs @@ -1,5 +1,6 @@ use std::cmp::{max, min}; +use niri_config::utils::MergeWith as _; use niri_config::window_rule::{Match, WindowRule}; use niri_config::{ BlockOutFrom, BorderRule, CornerRadius, FloatingPosition, PresetSize, ShadowRule, |