on master help sign in
Add `ui.statusline.inactive`, use `ui.statusline` for statusline text
1c1474cwojciechkepka
contrib/themes/bogster.toml+3−2
@@ -31,7 +31,8 @@
31"ui.background" = { bg = "#161c23" }
31"ui.background" = { bg = "#161c23" }
32"ui.linenr" = { fg = "#415367" }
32"ui.linenr" = { fg = "#415367" }
33"ui.linenr.selected" = { fg = "#e5ded6" } # TODO
33"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" }
35"ui.popup" = { bg = "#232d38" }
36"ui.popup" = { bg = "#232d38" }
36"ui.window" = { bg = "#232d38" }
37"ui.window" = { bg = "#232d38" }
37"ui.help" = { bg = "#232d38", fg = "#e5ded6" }
38"ui.help" = { bg = "#232d38", fg = "#e5ded6" }
@@ -39,7 +40,7 @@
39"ui.text" = { fg = "#e5ded6" }
40"ui.text" = { fg = "#e5ded6" }
40"ui.text.focus" = { fg = "#e5ded6", modifiers= ["bold"] }
41"ui.text.focus" = { fg = "#e5ded6", modifiers= ["bold"] }
41
42
42−"ui.selection" = { bg = "#540099" }
43+"ui.selection" = { bg = "#313f4e" }
43"ui.menu.selected" = { fg = "#e5ded6", bg = "#313f4e" }
44"ui.menu.selected" = { fg = "#e5ded6", bg = "#313f4e" }
44
45
45"warning" = "#dc7759"
46"warning" = "#dc7759"
contrib/themes/ingrid.toml+2−1
@@ -31,7 +31,8 @@
31"ui.background" = { bg = "#FFFCFD" }
31"ui.background" = { bg = "#FFFCFD" }
32"ui.linenr" = { fg = "#bbbbbb" }
32"ui.linenr" = { fg = "#bbbbbb" }
33"ui.linenr.selected" = { fg = "#F3EAE9" } # TODO
33"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" }
35"ui.popup" = { bg = "#F3EAE9" }
36"ui.popup" = { bg = "#F3EAE9" }
36"ui.window" = { bg = "#D8B8B3" }
37"ui.window" = { bg = "#D8B8B3" }
37"ui.help" = { bg = "#D8B8B3", fg = "#250E07" }
38"ui.help" = { bg = "#D8B8B3", fg = "#250E07" }
contrib/themes/onedark.toml+1
@@ -36,6 +36,7 @@
36"ui.linenr.selected" = { fg = "#ABB2BF" }
36"ui.linenr.selected" = { fg = "#ABB2BF" }
37"ui.popup" = { bg = "#3E4452" }
37"ui.popup" = { bg = "#3E4452" }
38"ui.statusline" = { fg = "#ABB2BF", bg = "#2C323C" }
38"ui.statusline" = { fg = "#ABB2BF", bg = "#2C323C" }
39+"ui.statusline.inactive" = { fg = "#ABB2Bf", bg = "#2C323C" }
39"ui.selection" = { bg = "#3E4452" }
40"ui.selection" = { bg = "#3E4452" }
40"ui.text" = { fg = "#ABB2BF", bg = "#282C34" }
41"ui.text" = { fg = "#ABB2BF", bg = "#282C34" }
41"ui.text.focus" = { fg = "#ABB2BF", bg = "#2C323C", modifiers = ['bold'] }
42"ui.text.focus" = { fg = "#ABB2BF", bg = "#2C323C", modifiers = ['bold'] }
helix-term/src/ui/editor.rs+7−10
@@ -476,18 +476,15 @@ impl EditorView {
476 Mode::Select => "SEL",
476 Mode::Select => "SEL",
477 Mode::Normal => "NOR",
477 Mode::Normal => "NOR",
478 };
478 };
479− let text_color = if is_focused {
479+ let style = if is_focused {
480− theme.get("ui.text.focus")
480+ theme.get("ui.statusline")
481 } else {
481 } else {
482− theme.get("ui.text")
482+ theme.get("ui.statusline.inactive")
483 };
483 };
484 // statusline
484 // statusline
485− surface.set_style(
486− Rect::new(viewport.x, viewport.y, viewport.width, 1),
485+ surface.set_style(Rect::new(viewport.x, viewport.y, viewport.width, 1), style);
487− theme.get("ui.statusline"),
488− );
489 if is_focused {
486 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);
491 }
488 }
492
489
493 if let Some(path) = doc.relative_path() {
490 if let Some(path) = doc.relative_path() {
@@ -499,7 +496,7 @@ impl EditorView {
499 viewport.y,
496 viewport.y,
500 title,
497 title,
501 viewport.width.saturating_sub(6) as usize,
498 viewport.width.saturating_sub(6) as usize,
502− text_color,
499+ style,
503 );
500 );
504 }
501 }
505
502
@@ -538,7 +535,7 @@ impl EditorView {
538 viewport.x + viewport.width.saturating_sub(text_len),
535 viewport.x + viewport.width.saturating_sub(text_len),
539 viewport.y,
536 viewport.y,
540 right_side_text,
537 right_side_text,
541− text_color,
538+ style,
542 );
539 );
543 }
540 }
544
541
theme.toml+2−1
@@ -41,7 +41,8 @@
41"ui.background" = { bg = "#3b224c" } # midnight
41"ui.background" = { bg = "#3b224c" } # midnight
42"ui.linenr" = { fg = "#5a5977" } # comet
42"ui.linenr" = { fg = "#5a5977" } # comet
43"ui.linenr.selected" = { fg = "#dbbfef" } # lilac
43"ui.linenr.selected" = { fg = "#dbbfef" } # lilac
44+"ui.statusline" = { fg = "#dbbfef", bg = "#281733" } # revolver
44−"ui.statusline" = { bg = "#281733" } # revolver
45+"ui.statusline.inactive" = { fg = "#a4a0e8", bg = "#281733" } # revolver
45"ui.popup" = { bg = "#281733" } # revolver
46"ui.popup" = { bg = "#281733" } # revolver
46"ui.window" = { bg = "#452859" } # bossa nova
47"ui.window" = { bg = "#452859" } # bossa nova
47"ui.window" = { bg = "#452859" } # bossa nova
48"ui.window" = { bg = "#452859" } # bossa nova