diff options
| author | denis <denismaximov98@gmail.com> | 2021-04-13 14:19:23 +0300 |
|---|---|---|
| committer | denis <denismaximov98@gmail.com> | 2021-04-13 14:19:23 +0300 |
| commit | b2139f4f3472b0cae18a106479e8a1ef92f7115e (patch) | |
| tree | 7578da36b75055890ee9517ca10a5b408b2e6750 | |
| parent | Merge branch 'main' into x-colors (diff) | |
| download | sl0ppij-b2139f4f3472b0cae18a106479e8a1ef92f7115e.tar.gz sl0ppij-b2139f4f3472b0cae18a106479e8a1ef92f7115e.tar.xz sl0ppij-b2139f4f3472b0cae18a106479e8a1ef92f7115e.zip | |
wip: fixing the first arrow
| -rw-r--r-- | default-tiles/status-bar/src/first_line.rs | 17 | ||||
| -rw-r--r-- | default-tiles/status-bar/src/second_line.rs | 1 |
2 files changed, 11 insertions, 7 deletions
diff --git a/default-tiles/status-bar/src/first_line.rs b/default-tiles/status-bar/src/first_line.rs index 11c17dac..4053210d 100644 --- a/default-tiles/status-bar/src/first_line.rs +++ b/default-tiles/status-bar/src/first_line.rs @@ -164,8 +164,8 @@ fn disabled_mode_shortcut(text: &str, palette: Palette) -> LinePart { .dimmed() .paint(format!("{} ", text)); let suffix_separator = Style::new() - .fg(RGB(palette.bg.0, palette.bg.1, palette.bg.2)) - .on(RGB(palette.fg.0, palette.fg.1, palette.fg.2)) + .fg(RGB(palette.fg.0, palette.fg.1, palette.fg.2)) + .on(RGB(palette.bg.0, palette.bg.1, palette.bg.2)) .paint(ARROW_SEPARATOR); LinePart { part: format!("{}{}{}", prefix_separator, styled_text, suffix_separator), @@ -187,7 +187,7 @@ fn selected_mode_shortcut_single_letter(letter: char, palette: Palette) -> LineP .bold() .paint(char_shortcut_text); let suffix_separator = Style::new() - .fg(RGB(palette.bg.0, palette.bg.1, palette.bg.2)) + .fg(RGB(palette.green.0, palette.green.1, palette.green.2)) .on(RGB(palette.fg.0, palette.fg.1, palette.fg.2)) .paint(ARROW_SEPARATOR); LinePart { @@ -210,8 +210,8 @@ fn unselected_mode_shortcut_single_letter(letter: char, palette: Palette) -> Lin .bold() .paint(char_shortcut_text); let suffix_separator = Style::new() - .fg(RGB(palette.bg.0, palette.bg.1, palette.bg.2)) - .on(RGB(palette.fg.0, palette.fg.1, palette.fg.2)) + .fg(RGB(palette.fg.0, palette.fg.1, palette.fg.2)) + .on(RGB(palette.bg.0, palette.bg.1, palette.bg.2)) .paint(ARROW_SEPARATOR); LinePart { part: ANSIStrings(&[prefix_separator, char_shortcut, suffix_separator]).to_string(), @@ -306,8 +306,13 @@ pub fn superkey(palette: Palette) -> LinePart { .on(RGB(palette.fg.0, palette.fg.1, palette.fg.2)) .bold() .paint(prefix_text); + + let suffix_separator = Style::new() + .fg(RGB(palette.fg.0, palette.fg.1, palette.fg.2)) + .on(RGB(palette.bg.0, palette.bg.1, palette.bg.2)) + .paint(ARROW_SEPARATOR); LinePart { - part: prefix.to_string(), + part: ANSIStrings(&[prefix, suffix_separator]).to_string(), len: prefix_text.chars().count(), } } diff --git a/default-tiles/status-bar/src/second_line.rs b/default-tiles/status-bar/src/second_line.rs index bc050b5a..1b2a74cd 100644 --- a/default-tiles/status-bar/src/second_line.rs +++ b/default-tiles/status-bar/src/second_line.rs @@ -220,7 +220,6 @@ fn locked_interface_indication(palette: Palette) -> LinePart { let locked_text = " -- INTERFACE LOCKED -- "; let locked_text_len = locked_text.chars().count(); let locked_styled_text = Style::new() - .on(RGB(palette.black.0, palette.black.1, palette.black.2)) .fg(RGB(palette.white.0, palette.white.1, palette.white.2)) .bold() .paint(locked_text); |