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/layout/mod.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/layout/mod.rs')
| -rw-r--r-- | src/layout/mod.rs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/layout/mod.rs b/src/layout/mod.rs index 370640b9..c7d8a6fd 100644 --- a/src/layout/mod.rs +++ b/src/layout/mod.rs @@ -38,6 +38,7 @@ use std::rc::Rc; use std::time::Duration; use monitor::{InsertHint, InsertPosition, InsertWorkspace, MonitorAddWindowTarget}; +use niri_config::utils::MergeWith as _; use niri_config::{ CenterFocusedColumn, Config, CornerRadius, FloatOrInt, PresetSize, Struts, Workspace as WorkspaceConfig, WorkspaceReference, @@ -5249,7 +5250,7 @@ impl<W: LayoutElement> Layout<W> { // Add border width since ColumnWidth includes borders. let rules = window.rules(); - let border = rules.border.resolve_against(self.options.border); + let border = self.options.border.merged_with(&rules.border); if !border.off { fixed += border.width.0 * 2.; } |