mirror of
https://github.com/LGUG2Z/komorebi.git
synced 2026-04-19 15:21:28 +02:00
Merge branch 'bar_widget_grouping' of https://github.com/CtByte/komorebi into bar_widget_grouping
This commit is contained in:
7
.github/pull_request_template.md
vendored
Normal file
7
.github/pull_request_template.md
vendored
Normal file
@@ -0,0 +1,7 @@
|
|||||||
|
<!--
|
||||||
|
Please follow the Conventional Commits specification.
|
||||||
|
|
||||||
|
If you need to update your PR with changes from `master`, please run `git rebase master`.
|
||||||
|
|
||||||
|
By opening this PR, you confirm that you have read and understood this project's `CONTRIBUTING.md`.
|
||||||
|
-->
|
||||||
@@ -1106,12 +1106,9 @@ impl StaticConfig {
|
|||||||
);
|
);
|
||||||
|
|
||||||
for (j, ws) in m.workspaces_mut().iter_mut().enumerate() {
|
for (j, ws) in m.workspaces_mut().iter_mut().enumerate() {
|
||||||
ws.load_static_config(
|
if let Some(workspace_config) = monitor.workspaces.get(j) {
|
||||||
monitor
|
ws.load_static_config(workspace_config)?;
|
||||||
.workspaces
|
}
|
||||||
.get(j)
|
|
||||||
.expect("no static workspace config"),
|
|
||||||
)?;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1169,12 +1166,9 @@ impl StaticConfig {
|
|||||||
);
|
);
|
||||||
|
|
||||||
for (j, ws) in m.workspaces_mut().iter_mut().enumerate() {
|
for (j, ws) in m.workspaces_mut().iter_mut().enumerate() {
|
||||||
ws.load_static_config(
|
if let Some(workspace_config) = monitor.workspaces.get(j) {
|
||||||
monitor
|
ws.load_static_config(workspace_config)?;
|
||||||
.workspaces
|
}
|
||||||
.get(j)
|
|
||||||
.expect("no static workspace config"),
|
|
||||||
)?;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user