feat: add bright-* colors & set defaults

This commit is contained in:
graelo 2020-05-29 20:48:54 +02:00
parent 4e8f4fb90b
commit 836d5bdc97
2 changed files with 15 additions and 7 deletions

View file

@ -11,6 +11,14 @@ pub fn parse_color(src: &str) -> Result<Box<dyn color::Color>, error::ParseError
"magenta" => Ok(Box::new(color::Magenta)), "magenta" => Ok(Box::new(color::Magenta)),
"cyan" => Ok(Box::new(color::Cyan)), "cyan" => Ok(Box::new(color::Cyan)),
"white" => Ok(Box::new(color::White)), "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)), // "default" => Ok(Box::new(color::Reset)),
_ => Err(error::ParseError::UnknownColor), _ => Err(error::ParseError::UnknownColor),
} }

View file

@ -24,30 +24,30 @@ pub struct View<'a> {
#[derive(Clap, Debug)] #[derive(Clap, Debug)]
pub struct ViewColors { pub struct ViewColors {
/// Foreground color for base text. /// Foreground color for base text.
#[clap(long, default_value = "blue", parse(try_from_str = colors::parse_color))] #[clap(long, default_value = "bright-cyan", parse(try_from_str = colors::parse_color))]
pub text_fg: Box<dyn color::Color>, pub text_fg: Box<dyn color::Color>,
/// Background color for base text. /// Background color for base text.
#[clap(long, default_value = "white", parse(try_from_str = colors::parse_color))] #[clap(long, default_value = "bright-white", parse(try_from_str = colors::parse_color))]
pub text_bg: Box<dyn color::Color>, pub text_bg: Box<dyn color::Color>,
/// Foreground color for matches. /// Foreground color for matches.
#[clap(long, default_value = "green", #[clap(long, default_value = "yellow",
parse(try_from_str = colors::parse_color))] parse(try_from_str = colors::parse_color))]
pub match_fg: Box<dyn color::Color>, pub match_fg: Box<dyn color::Color>,
/// Background color for matches. /// Background color for matches.
#[clap(long, default_value = "black", #[clap(long, default_value = "bright-white",
parse(try_from_str = colors::parse_color))] parse(try_from_str = colors::parse_color))]
pub match_bg: Box<dyn color::Color>, pub match_bg: Box<dyn color::Color>,
/// Foreground color for the focused match. /// Foreground color for the focused match.
#[clap(long, default_value = "blue", #[clap(long, default_value = "magenta",
parse(try_from_str = colors::parse_color))] parse(try_from_str = colors::parse_color))]
pub focused_fg: Box<dyn color::Color>, pub focused_fg: Box<dyn color::Color>,
/// Background color for the focused match. /// Background color for the focused match.
#[clap(long, default_value = "black", #[clap(long, default_value = "bright-white",
parse(try_from_str = colors::parse_color))] parse(try_from_str = colors::parse_color))]
pub focused_bg: Box<dyn color::Color>, pub focused_bg: Box<dyn color::Color>,
@ -57,7 +57,7 @@ pub struct ViewColors {
pub hint_fg: Box<dyn color::Color>, pub hint_fg: Box<dyn color::Color>,
/// Background color for hints. /// Background color for hints.
#[clap(long, default_value = "black", #[clap(long, default_value = "magenta",
parse(try_from_str = colors::parse_color))] parse(try_from_str = colors::parse_color))]
pub hint_bg: Box<dyn color::Color>, pub hint_bg: Box<dyn color::Color>,
} }