andrei/niri
1
0
Fork 0
mirror of https://github.com/niri-wm/niri.git synced 2026-06-21 02:01:55 +07:00
Code Issues Packages Projects Releases 10 Wiki Activity

config: Fix border rule on -> off merging

Browse Source
This commit is contained in:
Ivan Molodetskikh
2024-12-27 15:40:48 +03:00
parent 1f8aed6732
commit 4e357e9659
1 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
niri-config/src/lib.rs
+11 -4
View File
@@ -1589,8 +1589,15 @@ impl Default for Config {
impl BorderRule {
pub fn merge_with(&mut self, other: &Self) {
self.off |= other.off;
self.on |= other.on;
if other.off {
self.off = true;
self.on = false;
}
if other.on {
self.off = false;
self.on = true;
}
if let Some(x) = other.width {
self.width = Some(x);
@@ -3900,12 +3907,12 @@ mod tests {
assert_snapshot!(is_on("off", &["off", "off"]), @"off");
assert_snapshot!(is_on("off", &["off", "on"]), @"on");
assert_snapshot!(is_on("off", &["on", "off"]), @"on");
assert_snapshot!(is_on("off", &["on", "off"]), @"off");
assert_snapshot!(is_on("off", &["on", "on"]), @"on");
assert_snapshot!(is_on("on", &["off", "off"]), @"off");
assert_snapshot!(is_on("on", &["off", "on"]), @"on");
assert_snapshot!(is_on("on", &["on", "off"]), @"on");
assert_snapshot!(is_on("on", &["on", "off"]), @"off");
assert_snapshot!(is_on("on", &["on", "on"]), @"on");
}
}