diff --git a/default-plugins/compact-bar/src/line.rs b/default-plugins/compact-bar/src/line.rs index 04720766c..16d64d071 100644 --- a/default-plugins/compact-bar/src/line.rs +++ b/default-plugins/compact-bar/src/line.rs @@ -122,13 +122,13 @@ fn left_more_message( // 238 // chars length plus separator length on both sides let more_text_len = more_text.width() + 2 * separator.width(); - let text_color = match palette.theme_hue { - ThemeHue::Dark => palette.white, - ThemeHue::Light => palette.black, + let (text_color, sep_color) = match palette.theme_hue { + ThemeHue::Dark => (palette.white, palette.black), + ThemeHue::Light => (palette.black, palette.white), }; - let left_separator = style!(text_color, palette.orange).paint(separator); + let left_separator = style!(sep_color, palette.orange).paint(separator); let more_styled_text = style!(text_color, palette.orange).bold().paint(more_text); - let right_separator = style!(palette.orange, text_color).paint(separator); + let right_separator = style!(palette.orange, sep_color).paint(separator); let more_styled_text = ANSIStrings(&[left_separator, more_styled_text, right_separator]).to_string(); LinePart { @@ -154,13 +154,13 @@ fn right_more_message( }; // chars length plus separator length on both sides let more_text_len = more_text.width() + 2 * separator.width(); - let text_color = match palette.theme_hue { - ThemeHue::Dark => palette.white, - ThemeHue::Light => palette.black, + let (text_color, sep_color) = match palette.theme_hue { + ThemeHue::Dark => (palette.white, palette.black), + ThemeHue::Light => (palette.black, palette.white), }; - let left_separator = style!(text_color, palette.orange).paint(separator); + let left_separator = style!(sep_color, palette.orange).paint(separator); let more_styled_text = style!(text_color, palette.orange).bold().paint(more_text); - let right_separator = style!(palette.orange, text_color).paint(separator); + let right_separator = style!(palette.orange, sep_color).paint(separator); let more_styled_text = ANSIStrings(&[left_separator, more_styled_text, right_separator]).to_string(); LinePart { diff --git a/default-plugins/tab-bar/src/line.rs b/default-plugins/tab-bar/src/line.rs index 1022cda46..cb24873a9 100644 --- a/default-plugins/tab-bar/src/line.rs +++ b/default-plugins/tab-bar/src/line.rs @@ -123,13 +123,13 @@ fn left_more_message( // 238 // chars length plus separator length on both sides let more_text_len = more_text.width() + 2 * separator.width(); - let text_color = match palette.theme_hue { - ThemeHue::Dark => palette.white, - ThemeHue::Light => palette.black, + let (text_color, sep_color) = match palette.theme_hue { + ThemeHue::Dark => (palette.white, palette.black), + ThemeHue::Light => (palette.black, palette.white), }; - let left_separator = style!(text_color, palette.orange).paint(separator); + let left_separator = style!(sep_color, palette.orange).paint(separator); let more_styled_text = style!(text_color, palette.orange).bold().paint(more_text); - let right_separator = style!(palette.orange, text_color).paint(separator); + let right_separator = style!(palette.orange, sep_color).paint(separator); let more_styled_text = ANSIStrings(&[left_separator, more_styled_text, right_separator]).to_string(); LinePart { @@ -155,13 +155,13 @@ fn right_more_message( }; // chars length plus separator length on both sides let more_text_len = more_text.width() + 2 * separator.width(); - let text_color = match palette.theme_hue { - ThemeHue::Dark => palette.white, - ThemeHue::Light => palette.black, + let (text_color, sep_color) = match palette.theme_hue { + ThemeHue::Dark => (palette.white, palette.black), + ThemeHue::Light => (palette.black, palette.white), }; - let left_separator = style!(text_color, palette.orange).paint(separator); + let left_separator = style!(sep_color, palette.orange).paint(separator); let more_styled_text = style!(text_color, palette.orange).bold().paint(more_text); - let right_separator = style!(palette.orange, text_color).paint(separator); + let right_separator = style!(palette.orange, sep_color).paint(separator); let more_styled_text = ANSIStrings(&[left_separator, more_styled_text, right_separator]).to_string(); LinePart {