technofab/tmux-copyrat
1
0
Fork 0
mirror of https://github.com/TECHNOFAB11/tmux-copyrat.git synced 2025-12-12 08:00:08 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix: default colors

Browse source
This commit is contained in:
graelo 2021-03-23 22:20:21 +01:00
parent ae19f2b4e4
commit 7550895602
2 changed files with 17 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

32
src/ui/colors.rs
View file

@ -12,15 +12,15 @@ pub fn parse_color(src: &str) -> Result<Box<dyn color::Color>, error::ParseError
"magenta" => Ok(Box::new(color::Magenta)),
"cyan" => Ok(Box::new(color::Cyan)),
"white" => Ok(Box::new(color::White)),
"bright-black" => Ok(Box::new(color::LightBlack)),
"bright-red" => Ok(Box::new(color::LightRed)),
"bright-green" => Ok(Box::new(color::LightGreen)),
"bright-yellow" => Ok(Box::new(color::LightYellow)),
"bright-blue" => Ok(Box::new(color::LightBlue)),
"bright-magenta" => Ok(Box::new(color::LightMagenta)),
"bright-cyan" => Ok(Box::new(color::LightCyan)),
"bright-white" => Ok(Box::new(color::LightWhite)),
// "default" => Ok(Box::new(color::Reset)),
"bright-black" | "brightblack" => Ok(Box::new(color::LightBlack)),
"bright-red" | "brightred" => Ok(Box::new(color::LightRed)),
"bright-green" | "brightgreen" => Ok(Box::new(color::LightGreen)),
"bright-yellow" | "brightyellow" => Ok(Box::new(color::LightYellow)),
"bright-blue" | "brightblue" => Ok(Box::new(color::LightBlue)),
"bright-magenta" | "brightmagenta" => Ok(Box::new(color::LightMagenta)),
"bright-cyan" | "brightcyan" => Ok(Box::new(color::LightCyan)),
"bright-white" | "brightwhite" => Ok(Box::new(color::LightWhite)),
"none" => Ok(Box::new(color::Reset)),
_ => Err(error::ParseError::UnknownColor),
}
}
@ -56,20 +56,20 @@ mod tests {
#[clap(about)] // Needed to avoid this doc comment to be used as overall `about`.
pub struct UiColors {
/// Foreground color for base text.
#[clap(long, default_value = "bright-blue", parse(try_from_str = parse_color))]
#[clap(long, default_value = "bright-cyan", parse(try_from_str = parse_color))]
pub text_fg: Box<dyn color::Color>,
/// Background color for base text.
#[clap(long, default_value = "white", parse(try_from_str = parse_color))]
#[clap(long, default_value = "none", parse(try_from_str = parse_color))]
pub text_bg: Box<dyn color::Color>,
/// Foreground color for spans.
#[clap(long, default_value = "yellow",
#[clap(long, default_value = "blue",
parse(try_from_str = parse_color))]
pub span_fg: Box<dyn color::Color>,
/// Background color for spans.
#[clap(long, default_value = "white",
#[clap(long, default_value = "none",
parse(try_from_str = parse_color))]
pub span_bg: Box<dyn color::Color>,
@ -79,17 +79,17 @@ pub struct UiColors {
pub focused_fg: Box<dyn color::Color>,
/// Background color for the focused span.
#[clap(long, default_value = "white",
#[clap(long, default_value = "none",
parse(try_from_str = parse_color))]
pub focused_bg: Box<dyn color::Color>,
/// Foreground color for hints.
#[clap(long, default_value = "white",
#[clap(long, default_value = "yellow",
parse(try_from_str = parse_color))]
pub hint_fg: Box<dyn color::Color>,
/// Background color for hints.
#[clap(long, default_value = "magenta",
#[clap(long, default_value = "none",
parse(try_from_str = parse_color))]
pub hint_bg: Box<dyn color::Color>,
}

2
src/ui/vc.rs
View file

@ -265,7 +265,7 @@ impl<'a> ViewController<'a> {
fg_reset = fg_reset,
bg_reset = bg_reset,
sty = style::Bold,
sty_reset = style::NoBold,
sty_reset = style::Reset, // NoBold is not sufficient
hint = hint_text,
)
.unwrap();