diff options
| -rw-r--r-- | helix-term/src/commands.rs | 6 | ||||
| -rw-r--r-- | helix-term/src/ui/editor.rs | 1 | ||||
| -rw-r--r-- | helix-term/src/ui/info.rs | 9 |
3 files changed, 12 insertions, 4 deletions
diff --git a/helix-term/src/commands.rs b/helix-term/src/commands.rs index ddeded2d..854c34d3 100644 --- a/helix-term/src/commands.rs +++ b/helix-term/src/commands.rs @@ -3422,6 +3422,7 @@ macro_rules! mode_info { ], )); $cx.on_next_key(move |cx, event| { + cx.editor.autoinfo = None; match event { $( $keyp => $func(cx), @@ -3441,8 +3442,8 @@ fn space_mode(cx: &mut Context) { key!('w'); key!('w') => window_mode; "window mode", key!('y'); key!('y') => yank_joined_to_clipboard; "yank joined to clipboard", key!('Y'); key!('Y') => yank_main_selection_to_clipboard; "yank main selection to clipboard", - key!('p'); key!('p') => paste_clipboard_after; "paste clipboard after", - key!('P'); key!('P') => paste_clipboard_before; "paste clipboard before", + key!('p'); key!('p') => paste_clipboard_after; "paste system clipboard after selections", + key!('P'); key!('P') => paste_clipboard_before; "paste system clipboard before selections", key!('R'); key!('R') => replace_selections_with_clipboard; "replace selections with clipboard", key!(' '); key!(' ') => keep_primary_selection; "keep primary selection", } @@ -3466,6 +3467,7 @@ fn space_mode(cx: &mut Context) { // ], // )); // cx.on_next_key(move |cx, event| { +// cx.editor.autoinfo = None; // match event { // key!('f') => file_picker(cx), // key!('b') => buffer_picker(cx), diff --git a/helix-term/src/ui/editor.rs b/helix-term/src/ui/editor.rs index 8b7c92de..ad4f73bc 100644 --- a/helix-term/src/ui/editor.rs +++ b/helix-term/src/ui/editor.rs @@ -719,6 +719,7 @@ impl Component for EditorView { if let Some(info) = std::mem::take(&mut cx.editor.autoinfo) { info.render(area, surface, cx); + cx.editor.autoinfo = Some(info); } // render status msg diff --git a/helix-term/src/ui/info.rs b/helix-term/src/ui/info.rs index c5709356..87c2c213 100644 --- a/helix-term/src/ui/info.rs +++ b/helix-term/src/ui/info.rs @@ -6,14 +6,19 @@ use tui::widgets::{Block, Borders, Widget}; impl Component for Info { fn render(&self, viewport: Rect, surface: &mut Surface, cx: &mut Context) { - let block = Block::default().title(self.title).borders(Borders::ALL); + let style = cx.editor.theme.get("ui.popup"); + let block = Block::default() + .title(self.title) + .borders(Borders::ALL) + .border_style(style); let Info { width, height, .. } = self; let (w, h) = (*width + 2, *height + 2); // -2 to subtract command line + statusline. a bit of a hack, because of splits. let area = Rect::new(viewport.width - w, viewport.height - h - 2, w, h); + surface.clear_with(area, style); let Rect { x, y, .. } = block.inner(area); for (y, line) in (y..).zip(self.text.lines()) { - surface.set_string(x, y, line, Style::default()); + surface.set_string(x, y, line, style); } block.render(area, surface); } |