kc/helix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Fix rendering issues for infobox

Browse source
This commit is contained in:
Ivan Tham 2021-06-30 21:39:21 +08:00 • committed by Blaž Hrastnik
parent 9effe71b7d
commit 6710855eac
3 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
helix-term/src/commands.rs
View file

@ -3422,6 +3422,7 @@ macro_rules! mode_info {
], ],
)); ));
$cx.on_next_key(move |cx, event| { $cx.on_next_key(move |cx, event| {
cx.editor.autoinfo = None;
match event { match event {
$( $(
$keyp => $func(cx), $keyp => $func(cx),
@ -3441,8 +3442,8 @@ fn space_mode(cx: &mut Context) {
key!('w'); key!('w') => window_mode; "window mode", 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_joined_to_clipboard; "yank joined to clipboard",
key!('Y'); key!('Y') => yank_main_selection_to_clipboard; "yank main selection 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_after; "paste system clipboard after selections",
key!('P'); key!('P') => paste_clipboard_before; "paste clipboard before", 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!('R'); key!('R') => replace_selections_with_clipboard; "replace selections with clipboard",
key!(' '); key!(' ') => keep_primary_selection; "keep primary selection", 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.on_next_key(move |cx, event| {
// cx.editor.autoinfo = None;
// match event { // match event {
// key!('f') => file_picker(cx), // key!('f') => file_picker(cx),
// key!('b') => buffer_picker(cx), // key!('b') => buffer_picker(cx),

1
helix-term/src/ui/editor.rs
View file

@ -719,6 +719,7 @@ impl Component for EditorView {
if let Some(info) = std::mem::take(&mut cx.editor.autoinfo) { if let Some(info) = std::mem::take(&mut cx.editor.autoinfo) {
info.render(area, surface, cx); info.render(area, surface, cx);
cx.editor.autoinfo = Some(info);
} }
// render status msg // render status msg

9
helix-term/src/ui/info.rs
View file

@ -6,14 +6,19 @@ use tui::widgets::{Block, Borders, Widget};
impl Component for Info { impl Component for Info {
fn render(&self, viewport: Rect, surface: &mut Surface, cx: &mut Context) { 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 Info { width, height, .. } = self;
let (w, h) = (*width + 2, *height + 2); let (w, h) = (*width + 2, *height + 2);
// -2 to subtract command line + statusline. a bit of a hack, because of splits. // -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); 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); let Rect { x, y, .. } = block.inner(area);
for (y, line) in (y..).zip(self.text.lines()) { 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); block.render(area, surface);
} }