starred/komorebi
1
0
Fork 0
mirror of https://github.com/LGUG2Z/komorebi.git synced 2026-05-01 08:24:20 +02:00
Code Issues 87 Packages Projects Releases 11 Wiki Activity

fix(config): unset values on ws configs appropriately

Browse Source 
This commit ensures that if a user removes an optional block from the
static config file, when reloading a workspace config, the removed
option will also be unset in the window manager workspace configuration
state.
This commit is contained in:
LGUG2Z
2025-01-27 08:42:40 -08:00
parent b8e8ac2cc9
commit 59cd36a2b1
1 changed files with 12 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
komorebi/src/workspace.rs
View File

@@ -161,34 +161,32 @@ impl Workspace {
self.tile = false;
}
let mut all_layout_rules = vec![];
if let Some(layout_rules) = &config.layout_rules {
let mut all_rules = vec![];
for (count, rule) in layout_rules {
all_rules.push((*count, Layout::Default(*rule)));
all_layout_rules.push((*count, Layout::Default(*rule)));
}
self.set_layout_rules(all_rules);
self.tile = true;
}
self.set_layout_rules(all_layout_rules.clone());
if let Some(layout_rules) = &config.custom_layout_rules {
let rules = self.layout_rules_mut();
for (count, pathbuf) in layout_rules {
let rule = CustomLayout::from_path(pathbuf)?;
rules.push((*count, Layout::Custom(rule)));
all_layout_rules.push((*count, Layout::Custom(rule)));
}
self.tile = true;
self.set_layout_rules(all_layout_rules);
}
self.set_apply_window_based_work_area_offset(
config.apply_window_based_work_area_offset.unwrap_or(true),
);
if config.window_container_behaviour.is_some() {
self.set_window_container_behaviour(config.window_container_behaviour);
}
self.set_window_container_behaviour(config.window_container_behaviour);
if let Some(window_container_behaviour_rules) = &config.window_container_behaviour_rules {
if window_container_behaviour_rules.is_empty() {
@@ -201,15 +199,13 @@ impl Workspace {
self.set_window_container_behaviour_rules(Some(all_rules));
}
} else {
self.set_window_container_behaviour_rules(None);
self.set_window_container_behaviour(None);
}
if config.float_override.is_some() {
self.set_float_override(config.float_override);
}
if config.layout_flip.is_some() {
self.set_layout_flip(config.layout_flip);
}
self.set_float_override(config.float_override);
self.set_layout_flip(config.layout_flip);
Ok(())
}