fix some bugs relating to tab behavior and border rendering
This commit is contained in:
parent
f056727621
commit
206a5fb19e
12 changed files with 240 additions and 172 deletions
|
|
@ -213,6 +213,7 @@ pub struct Theme {
|
|||
pub bar_bg_color: Option<Color>,
|
||||
pub bar_status_text_color: Option<Color>,
|
||||
pub border_color: Option<Color>,
|
||||
pub active_border_color: Option<Color>,
|
||||
pub captured_focused_title_bg_color: Option<Color>,
|
||||
pub captured_unfocused_title_bg_color: Option<Color>,
|
||||
pub focused_inactive_title_bg_color: Option<Color>,
|
||||
|
|
|
|||
|
|
@ -63,7 +63,14 @@ impl Parser for ThemeParser<'_> {
|
|||
font,
|
||||
title_font,
|
||||
),
|
||||
(bar_font, bar_position_val, bar_separator_width, gap, floating_titles),
|
||||
(
|
||||
bar_font,
|
||||
bar_position_val,
|
||||
bar_separator_width,
|
||||
gap,
|
||||
floating_titles,
|
||||
active_border_color,
|
||||
),
|
||||
) = ext.extract((
|
||||
(
|
||||
opt(val("attention-requested-bg-color")),
|
||||
|
|
@ -95,6 +102,7 @@ impl Parser for ThemeParser<'_> {
|
|||
recover(opt(s32("bar-separator-width"))),
|
||||
recover(opt(s32("gap"))),
|
||||
recover(opt(bol("floating-titles"))),
|
||||
opt(val("active-border-color")),
|
||||
),
|
||||
))?;
|
||||
let (title_gap, corner_radius) = ext.extract((
|
||||
|
|
@ -175,6 +183,7 @@ impl Parser for ThemeParser<'_> {
|
|||
bar_bg_color: color!(bar_bg_color),
|
||||
bar_status_text_color: color!(bar_status_text_color),
|
||||
border_color: color!(border_color),
|
||||
active_border_color: color!(active_border_color),
|
||||
captured_focused_title_bg_color: color!(captured_focused_title_bg_color),
|
||||
captured_unfocused_title_bg_color: color!(captured_unfocused_title_bg_color),
|
||||
focused_inactive_title_bg_color: color!(focused_inactive_title_bg_color),
|
||||
|
|
|
|||
|
|
@ -990,6 +990,7 @@ impl State {
|
|||
color!(BAR_BACKGROUND_COLOR, bar_bg_color);
|
||||
color!(BAR_STATUS_TEXT_COLOR, bar_status_text_color);
|
||||
color!(BORDER_COLOR, border_color);
|
||||
color!(ACTIVE_BORDER_COLOR, active_border_color);
|
||||
color!(
|
||||
CAPTURED_FOCUSED_TITLE_BACKGROUND_COLOR,
|
||||
captured_focused_title_bg_color
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue