git.iko.soy/helix
on master help sign in
Add theme key for picker separator (#2523)
bfc4ff4kyrime
book/src/themes.md+35−34
compare with master
unifiedsplit
@@ -205,39 +205,40 @@ These scopes are used for theming the editor interface.
205 - `hover` - for hover popup ui
205 - `hover` - for hover popup ui
206
206
207
207
208−| Key | Notes |
208+| Key | Notes |
209−| --- | --- |
209+| --- | --- |
210−| `ui.background` | |
210+| `ui.background` | |
211+| `ui.background.separator` | Picker separator below input line |
211−| `ui.cursor` | |
212+| `ui.cursor` | |
212−| `ui.cursor.insert` | |
213+| `ui.cursor.insert` | |
213−| `ui.cursor.select` | |
214+| `ui.cursor.select` | |
214−| `ui.cursor.match` | Matching bracket etc. |
215+| `ui.cursor.match` | Matching bracket etc. |
215−| `ui.cursor.primary` | Cursor with primary selection |
216+| `ui.cursor.primary` | Cursor with primary selection |
216−| `ui.linenr` | Line numbers |
217+| `ui.linenr` | Line numbers |
217−| `ui.linenr.selected` | Line number for the line the cursor is on |
218+| `ui.linenr.selected` | Line number for the line the cursor is on |
218−| `ui.statusline` | Statusline |
219+| `ui.statusline` | Statusline |
219−| `ui.statusline.inactive` | Statusline (unfocused document) |
220+| `ui.statusline.inactive` | Statusline (unfocused document) |
220−| `ui.popup` | Documentation popups (e.g space-k) |
221+| `ui.popup` | Documentation popups (e.g space-k) |
221−| `ui.popup.info` | Prompt for multiple key options |
222+| `ui.popup.info` | Prompt for multiple key options |
222−| `ui.window` | Border lines separating splits |
223+| `ui.window` | Border lines separating splits |
223−| `ui.help` | Description box for commands |
224+| `ui.help` | Description box for commands |
224−| `ui.text` | Command prompts, popup text, etc. |
225+| `ui.text` | Command prompts, popup text, etc. |
225−| `ui.text.focus` | |
226+| `ui.text.focus` | |
226−| `ui.text.info` | The key: command text in `ui.popup.info` boxes |
227+| `ui.text.info` | The key: command text in `ui.popup.info` boxes |
227−| `ui.virtual.ruler` | Ruler columns (see the [`editor.rulers` config][rulers-config])|
228+| `ui.virtual.ruler` | Ruler columns (see the [`editor.rulers` config][rulers-config])|
228−| `ui.virtual.whitespace` | Visible white-space characters |
229+| `ui.virtual.whitespace` | Visible white-space characters |
229−| `ui.menu` | Code and command completion menus |
230+| `ui.menu` | Code and command completion menus |
230−| `ui.menu.selected` | Selected autocomplete item |
231+| `ui.menu.selected` | Selected autocomplete item |
231−| `ui.selection` | For selections in the editing area |
232+| `ui.selection` | For selections in the editing area |
232−| `ui.selection.primary` | |
233+| `ui.selection.primary` | |
233−| `warning` | Diagnostics warning (gutter) |
234+| `warning` | Diagnostics warning (gutter) |
234−| `error` | Diagnostics error (gutter) |
235+| `error` | Diagnostics error (gutter) |
235−| `info` | Diagnostics info (gutter) |
236+| `info` | Diagnostics info (gutter) |
236−| `hint` | Diagnostics hint (gutter) |
237+| `hint` | Diagnostics hint (gutter) |
237−| `diagnostic` | Diagnostics fallback style (editing area) |
238+| `diagnostic` | Diagnostics fallback style (editing area) |
238−| `diagnostic.hint` | Diagnostics hint (editing area) |
239+| `diagnostic.hint` | Diagnostics hint (editing area) |
239−| `diagnostic.info` | Diagnostics info (editing area) |
240+| `diagnostic.info` | Diagnostics info (editing area) |
240−| `diagnostic.warning` | Diagnostics warning (editing area) |
241+| `diagnostic.warning` | Diagnostics warning (editing area) |
241−| `diagnostic.error` | Diagnostics error (editing area) |
242+| `diagnostic.error` | Diagnostics error (editing area) |
242
243
243[rulers-config]: ./configuration.md#editor-section
244[rulers-config]: ./configuration.md#editor-section
helix-term/src/ui/picker.rs+2−2
@@ -26,7 +26,7 @@ use crate::ui::{Prompt, PromptEvent};
26use helix_core::{movement::Direction, Position};
26use helix_core::{movement::Direction, Position};
27use helix_view::{
27use helix_view::{
28 editor::Action,
28 editor::Action,
29− graphics::{Color, CursorKind, Margin, Modifier, Rect, Style},
29+ graphics::{CursorKind, Margin, Modifier, Rect},
30 Document, Editor,
30 Document, Editor,
31};
31};
32
32
@@ -587,7 +587,7 @@ impl<T: 'static> Component for Picker<T> {
587 self.prompt.render(area, surface, cx);
587 self.prompt.render(area, surface, cx);
588
588
589 // -- Separator
589 // -- Separator
590− let sep_style = Style::default().fg(Color::Rgb(90, 89, 119));
590+ let sep_style = cx.editor.theme.get("ui.background.separator");
591 let borders = BorderType::line_symbols(BorderType::Plain);
591 let borders = BorderType::line_symbols(BorderType::Plain);
592 for x in inner.left()..inner.right() {
592 for x in inner.left()..inner.right() {
593 if let Some(cell) = surface.get_mut(x, inner.y + 1) {
593 if let Some(cell) = surface.get_mut(x, inner.y + 1) {
theme.toml+1
@@ -43,6 +43,7 @@ label = "honey"
43# concat (ERROR) @error.syntax and "MISSING ;" selectors for errors
43# concat (ERROR) @error.syntax and "MISSING ;" selectors for errors
44
44
45"ui.background" = { bg = "midnight" }
45"ui.background" = { bg = "midnight" }
46+"ui.background.separator" = { fg = "comet" }
46"ui.linenr" = { fg = "comet" }
47"ui.linenr" = { fg = "comet" }
47"ui.linenr.selected" = { fg = "lilac" }
48"ui.linenr.selected" = { fg = "lilac" }
48"ui.statusline" = { fg = "lilac", bg = "revolver" }
49"ui.statusline" = { fg = "lilac", bg = "revolver" }