starred/komorebi
1
0
Fork 0
mirror of https://github.com/LGUG2Z/komorebi.git synced 2026-04-25 10:08:33 +02:00
Code Issues 87 Packages Projects Releases 10 Wiki Activity

fix(config): gen border colours only if set

Browse Source
This commit is contained in:
Matt Blacker
2023-07-19 21:22:44 +10:00
committed by LGUG2Z
parent acf201d9bc
commit cfe4062369
1 changed files with 17 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
komorebi/src/static_config.rs
View File

@@ -358,10 +358,22 @@ impl From<&WindowManager> for StaticConfig {
} }
} }
let border_colours = ActiveWindowBorderColours { let border_colours = if BORDER_COLOUR_SINGLE.load(Ordering::SeqCst) == 0 {
single: Rgb::from(BORDER_COLOUR_SINGLE.load(Ordering::SeqCst)), None
stack: Rgb::from(BORDER_COLOUR_STACK.load(Ordering::SeqCst)), } else {
monocle: Rgb::from(BORDER_COLOUR_MONOCLE.load(Ordering::SeqCst)), Option::from(ActiveWindowBorderColours {
single: Rgb::from(BORDER_COLOUR_SINGLE.load(Ordering::SeqCst)),
stack: Rgb::from(if BORDER_COLOUR_STACK.load(Ordering::SeqCst) == 0 {
BORDER_COLOUR_SINGLE.load(Ordering::SeqCst)
} else {
BORDER_COLOUR_STACK.load(Ordering::SeqCst)
}),
monocle: Rgb::from(if BORDER_COLOUR_MONOCLE.load(Ordering::SeqCst) == 0 {
BORDER_COLOUR_SINGLE.load(Ordering::SeqCst)
} else {
BORDER_COLOUR_MONOCLE.load(Ordering::SeqCst)
}),
})
}; };
Self { Self {
@@ -382,7 +394,7 @@ impl From<&WindowManager> for StaticConfig {
border_width: Option::from(BORDER_WIDTH.load(Ordering::SeqCst)), border_width: Option::from(BORDER_WIDTH.load(Ordering::SeqCst)),
border_offset: *BORDER_OFFSET.lock(), border_offset: *BORDER_OFFSET.lock(),
active_window_border: Option::from(BORDER_ENABLED.load(Ordering::SeqCst)), active_window_border: Option::from(BORDER_ENABLED.load(Ordering::SeqCst)),
active_window_border_colours: Option::from(border_colours), active_window_border_colours: border_colours,
default_workspace_padding: Option::from( default_workspace_padding: Option::from(
DEFAULT_WORKSPACE_PADDING.load(Ordering::SeqCst), DEFAULT_WORKSPACE_PADDING.load(Ordering::SeqCst),
), ),