From c86a51cba836decaaeed2b67a79fc5ee0c54cd26 Mon Sep 17 00:00:00 2001 From: Stephan Dilly Date: Wed, 20 May 2020 00:11:52 +0200 Subject: [PATCH] allow style to be readable on light themes aswell --- src/tabs/revlog/mod.rs | 1 + src/ui/style.rs | 18 ++++++++++++------ 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/src/tabs/revlog/mod.rs b/src/tabs/revlog/mod.rs index 495224d1..22938c9f 100644 --- a/src/tabs/revlog/mod.rs +++ b/src/tabs/revlog/mod.rs @@ -159,6 +159,7 @@ impl Revlog { theme: &Theme, ) { let count_before = txt.len(); + txt.reserve(ELEMENTS_PER_LINE); let splitter_txt = Cow::from(" "); let splitter = diff --git a/src/ui/style.rs b/src/ui/style.rs index b0af7748..22e700f6 100644 --- a/src/ui/style.rs +++ b/src/ui/style.rs @@ -71,7 +71,9 @@ impl Theme { match (enabled, selected) { (false, _) => Style::default().fg(self.disabled_fg), (true, false) => Style::default(), - (true, true) => Style::default().bg(self.selection_bg), + (true, true) => Style::default() + .fg(self.command_fg) + .bg(self.selection_bg), } } @@ -123,10 +125,14 @@ impl Theme { DiffLineType::Delete => { Style::default().fg(self.diff_line_delete) } - DiffLineType::Header => { - Style::default().modifier(Modifier::BOLD) - } - _ => Style::default(), + DiffLineType::Header => Style::default() + .fg(self.disabled_fg) + .modifier(Modifier::BOLD), + _ => Style::default().fg(if selected { + self.command_fg + } else { + Color::Reset + }), }; self.apply_select(style, selected) @@ -217,7 +223,7 @@ impl Default for Theme { diff_file_added: Color::LightGreen, diff_file_removed: Color::LightRed, diff_file_moved: Color::LightMagenta, - diff_file_modified: Color::LightYellow, + diff_file_modified: Color::Yellow, commit_hash: Color::Magenta, commit_time: Color::Blue, commit_author: Color::Green,