aboutsummaryrefslogtreecommitdiff
path: root/helix-term/src/ui
diff options
context:
space:
mode:
authorNathan Vegdahl2021-07-06 03:27:49 +0000
committerNathan Vegdahl2021-07-06 03:27:49 +0000
commit85d5b399de70ff075a455ce2858549d1ed012fe3 (patch)
tree4824fcb47f39551d3b31a62931adaf0ee406c02b /helix-term/src/ui
parent6e15c9b8745e9708ee5271c8701d41a8393cb038 (diff)
parent3c31f501164080998975883eb6f93c49bd8d3efb (diff)
Merge branch 'master' into great_line_ending_and_cursor_range_cleanup
Diffstat (limited to 'helix-term/src/ui')
-rw-r--r--helix-term/src/ui/editor.rs8
-rw-r--r--helix-term/src/ui/info.rs30
-rw-r--r--helix-term/src/ui/mod.rs1
3 files changed, 37 insertions, 2 deletions
diff --git a/helix-term/src/ui/editor.rs b/helix-term/src/ui/editor.rs
index dab654ad..d374d9b6 100644
--- a/helix-term/src/ui/editor.rs
+++ b/helix-term/src/ui/editor.rs
@@ -738,6 +738,11 @@ impl Component for EditorView {
self.render_view(doc, view, area, surface, &cx.editor.theme, is_focused);
}
+ if let Some(info) = std::mem::take(&mut cx.editor.autoinfo) {
+ info.render(area, surface, cx);
+ cx.editor.autoinfo = Some(info);
+ }
+
// render status msg
if let Some((status_msg, severity)) = &cx.editor.status_msg {
use helix_view::editor::Severity;
@@ -756,8 +761,7 @@ impl Component for EditorView {
}
if let Some(completion) = &self.completion {
- completion.render(area, surface, cx)
- // render completion here
+ completion.render(area, surface, cx);
}
}
diff --git a/helix-term/src/ui/info.rs b/helix-term/src/ui/info.rs
new file mode 100644
index 00000000..e5f20562
--- /dev/null
+++ b/helix-term/src/ui/info.rs
@@ -0,0 +1,30 @@
+use crate::compositor::{Component, Context};
+use helix_view::graphics::Rect;
+use helix_view::info::Info;
+use tui::buffer::Buffer as Surface;
+use tui::widgets::{Block, Borders, Widget};
+
+impl Component for Info {
+ fn render(&self, viewport: Rect, surface: &mut Surface, cx: &mut Context) {
+ 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 = viewport.intersection(Rect::new(
+ viewport.width.saturating_sub(w),
+ viewport.height.saturating_sub(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);
+ }
+ block.render(area, surface);
+ }
+}
diff --git a/helix-term/src/ui/mod.rs b/helix-term/src/ui/mod.rs
index 7111c968..288d3d2e 100644
--- a/helix-term/src/ui/mod.rs
+++ b/helix-term/src/ui/mod.rs
@@ -1,5 +1,6 @@
mod completion;
mod editor;
+mod info;
mod markdown;
mod menu;
mod picker;