kdheepak/taskwarrior-tui
1
0
Fork 0
mirror of https://github.com/kdheepak/taskwarrior-tui.git synced 2025-08-26 03:07:18 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

More accurate colors

Browse source
This commit is contained in:
Dheepak Krishnamurthy 2021-02-15 11:34:49 -07:00
parent 4b92e6e957
commit cadfa35244
2 changed files with 33 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/app.rs
View file

@ -1767,9 +1767,10 @@ mod tests {
let style = app.style_for_task(&task); let style = app.style_for_task(&task);
dbg!(style); dbg!(style);
assert!(style == Style::default().fg(Color::Green).bg(Color::Reset)); assert!(style == Style::default().fg(Color::Green));
let task = app.task_by_id(11).unwrap(); let task = app.task_by_id(11).unwrap();
dbg!(task.tags().unwrap());
let style = app.style_for_task(&task); let style = app.style_for_task(&task);
dbg!(style); dbg!(style);
} }

34
src/config.rs
View file

@ -7,11 +7,14 @@ use tui::style::{Color, Modifier, Style};
pub fn blend(style: Style, c: TColor) -> Style { pub fn blend(style: Style, c: TColor) -> Style {
let mut style = style; let mut style = style;
if style.fg.is_none() || c.fg != Color::Reset { let mut c = c;
c.upgrade();
if c.fg != Color::Reset {
style = style.fg(c.fg); style = style.fg(c.fg);
} }
if style.bg.is_none() || c.bg != Color::Reset { if c.bg != Color::Reset {
style = style.bg(c.bg); style = style.bg(c.bg);
} }
@ -48,7 +51,32 @@ impl TColor {
Self { fg, bg, modifiers } Self { fg, bg, modifiers }
} }
pub fn blend(&mut self, c: Color) {} pub fn upgrade(&mut self) {
if self.modifiers.contains(&Modifier::BOLD) {
self.fg = match self.fg {
Color::Red => Color::LightRed,
Color::Green => Color::LightGreen,
Color::Yellow => Color::LightYellow,
Color::Blue => Color::LightBlue,
Color::Magenta => Color::LightMagenta,
Color::Cyan => Color::LightCyan,
Color::White => Color::Indexed(7),
Color::Black => Color::Indexed(0),
x => x,
};
self.bg = match self.bg {
Color::Red => Color::LightRed,
Color::Green => Color::LightGreen,
Color::Yellow => Color::LightYellow,
Color::Blue => Color::LightBlue,
Color::Magenta => Color::LightMagenta,
Color::Cyan => Color::LightCyan,
Color::White => Color::Indexed(7),
Color::Black => Color::Indexed(0),
x => x,
};
}
}
} }
trait TaskWarriorBool { trait TaskWarriorBool {