on master help sign in
Add `ui.statusline.inactive`, use `ui.statusline` for statusline text
commit1c1474c3b8dbab8ca4b9a62220c079ddffb7ed9f authorwojciechkepka <wojtek.kepka@protonmail.com> dateFri 18 Jun 2021, 20:22 (5 years ago) parentb052223
5 files changed+15−14
contrib/themes/bogster.toml+3−2 contrib/themes/ingrid.toml+2−1 contrib/themes/onedark.toml+1 helix-term/src/ui/editor.rs+7−10 theme.toml+2−1
contrib/themes/bogster.toml+3−2
@@ -31,7 +31,8 @@
3131"ui.background" = { bg = "#161c23" }
3232"ui.linenr" = { fg = "#415367" }
3333"ui.linenr.selected" = { fg = "#e5ded6" } # TODO
34−"ui.statusline" = { bg = "#232d38" }
34+"ui.statusline" = { fg = "#e5ded6", bg = "#232d38" }
35+"ui.statusline.inactive" = { fg = "#c6b8ad", bg = "#232d38" }
3536"ui.popup" = { bg = "#232d38" }
3637"ui.window" = { bg = "#232d38" }
3738"ui.help" = { bg = "#232d38", fg = "#e5ded6" }
@@ -39,7 +40,7 @@
3940"ui.text" = { fg = "#e5ded6" }
4041"ui.text.focus" = { fg = "#e5ded6", modifiers= ["bold"] }
4142
42−"ui.selection" = { bg = "#540099" }
43+"ui.selection" = { bg = "#313f4e" }
4344"ui.menu.selected" = { fg = "#e5ded6", bg = "#313f4e" }
4445
4546"warning" = "#dc7759"
contrib/themes/ingrid.toml+2−1
@@ -31,7 +31,8 @@
3131"ui.background" = { bg = "#FFFCFD" }
3232"ui.linenr" = { fg = "#bbbbbb" }
3333"ui.linenr.selected" = { fg = "#F3EAE9" } # TODO
34−"ui.statusline" = { bg = "#F3EAE9" }
34+"ui.statusline" = { fg = "#250E07", bg = "#F3EAE9" }
35+"ui.statusline.inactive" = { fg = "#7b91b3", bg = "#F3EAE9" }
3536"ui.popup" = { bg = "#F3EAE9" }
3637"ui.window" = { bg = "#D8B8B3" }
3738"ui.help" = { bg = "#D8B8B3", fg = "#250E07" }
contrib/themes/onedark.toml+1
@@ -36,6 +36,7 @@
3636"ui.linenr.selected" = { fg = "#ABB2BF" }
3737"ui.popup" = { bg = "#3E4452" }
3838"ui.statusline" = { fg = "#ABB2BF", bg = "#2C323C" }
39+"ui.statusline.inactive" = { fg = "#ABB2Bf", bg = "#2C323C" }
3940"ui.selection" = { bg = "#3E4452" }
4041"ui.text" = { fg = "#ABB2BF", bg = "#282C34" }
4142"ui.text.focus" = { fg = "#ABB2BF", bg = "#2C323C", modifiers = ['bold'] }
helix-term/src/ui/editor.rs+7−10
@@ -476,18 +476,15 @@ impl EditorView {
476476 Mode::Select => "SEL",
477477 Mode::Normal => "NOR",
478478 };
479− let text_color = if is_focused {
480− theme.get("ui.text.focus")
479+ let style = if is_focused {
480+ theme.get("ui.statusline")
481481 } else {
482− theme.get("ui.text")
482+ theme.get("ui.statusline.inactive")
483483 };
484484 // statusline
485− surface.set_style(
486− Rect::new(viewport.x, viewport.y, viewport.width, 1),
487− theme.get("ui.statusline"),
488− );
485+ surface.set_style(Rect::new(viewport.x, viewport.y, viewport.width, 1), style);
489486 if is_focused {
490− surface.set_string(viewport.x + 1, viewport.y, mode, text_color);
487+ surface.set_string(viewport.x + 1, viewport.y, mode, style);
491488 }
492489
493490 if let Some(path) = doc.relative_path() {
@@ -499,7 +496,7 @@ impl EditorView {
499496 viewport.y,
500497 title,
501498 viewport.width.saturating_sub(6) as usize,
502− text_color,
499+ style,
503500 );
504501 }
505502
@@ -538,7 +535,7 @@ impl EditorView {
538535 viewport.x + viewport.width.saturating_sub(text_len),
539536 viewport.y,
540537 right_side_text,
541− text_color,
538+ style,
542539 );
543540 }
544541
theme.toml+2−1
@@ -41,7 +41,8 @@
4141"ui.background" = { bg = "#3b224c" } # midnight
4242"ui.linenr" = { fg = "#5a5977" } # comet
4343"ui.linenr.selected" = { fg = "#dbbfef" } # lilac
44−"ui.statusline" = { bg = "#281733" } # revolver
44+"ui.statusline" = { fg = "#dbbfef", bg = "#281733" } # revolver
45+"ui.statusline.inactive" = { fg = "#a4a0e8", bg = "#281733" } # revolver
4546"ui.popup" = { bg = "#281733" } # revolver
4647"ui.window" = { bg = "#452859" } # bossa nova
4748"ui.window" = { bg = "#452859" } # bossa nova