diff options
author | Blaž Hrastnik | 2021-06-03 01:28:49 +0000 |
---|---|---|
committer | Blaž Hrastnik | 2021-06-03 01:28:49 +0000 |
commit | c0332bd935bb7c016278d43a526e588558a0cab1 (patch) | |
tree | d7a65b8aef3bde84baa7a39196a089e203f95d2a /helix-term/src | |
parent | 3c7729906c9a677d715f2694c16cd78200691aaf (diff) |
Fix split sizes getting out of sync with the terminal size, refs #69
Diffstat (limited to 'helix-term/src')
-rw-r--r-- | helix-term/src/compositor.rs | 10 | ||||
-rw-r--r-- | helix-term/src/ui/editor.rs | 8 | ||||
-rw-r--r-- | helix-term/src/ui/prompt.rs | 8 |
3 files changed, 21 insertions, 5 deletions
diff --git a/helix-term/src/compositor.rs b/helix-term/src/compositor.rs index 7753e0a5..967ea034 100644 --- a/helix-term/src/compositor.rs +++ b/helix-term/src/compositor.rs @@ -122,11 +122,17 @@ impl Compositor { } pub fn render(&mut self, cx: &mut Context) { - self.terminal.autoresize().unwrap(); - let area = self.size(); + let area = self + .terminal + .autoresize() + .expect("Unable to determine terminal size"); + + // TODO: need to recalculate view tree if necessary let surface = self.terminal.current_buffer_mut(); + let area = surface.area().clone(); + for layer in &self.layers { layer.render(area, surface, cx) } diff --git a/helix-term/src/ui/editor.rs b/helix-term/src/ui/editor.rs index 47770ebd..e92cf4f1 100644 --- a/helix-term/src/ui/editor.rs +++ b/helix-term/src/ui/editor.rs @@ -240,7 +240,7 @@ impl EditorView { for selection in doc .selection(view.id) .iter() - .filter(|range| range.overlaps(&screen)) + .filter(|range| screen.overlaps(&range)) { // TODO: render also if only one of the ranges is in viewport let mut start = view.screen_coords_at_pos(doc, text, selection.anchor); @@ -261,7 +261,7 @@ impl EditorView { Rect::new( viewport.x + start.col as u16, viewport.y + start.row as u16, - (end.col - start.col) as u16 + 1, + ((end.col - start.col) as u16 + 1).min(viewport.width), 1, ), selection_style, @@ -633,6 +633,10 @@ impl Component for EditorView { // clear with background color surface.set_style(area, cx.editor.theme.get("ui.background")); + // if the terminal size suddenly changed, we need to trigger a resize + cx.editor + .resize(Rect::new(area.x, area.y, area.width, area.height - 1)); // - 1 to account for commandline + for (view, is_focused) in cx.editor.tree.views() { let doc = cx.editor.document(view.doc).unwrap(); self.render_view(doc, view, area, surface, &cx.editor.theme, is_focused); diff --git a/helix-term/src/ui/prompt.rs b/helix-term/src/ui/prompt.rs index 8bb6ba93..1f424878 100644 --- a/helix-term/src/ui/prompt.rs +++ b/helix-term/src/ui/prompt.rs @@ -160,7 +160,13 @@ impl Prompt { if let Some(doc) = (self.doc_fn)(&self.line) { let text = ui::Text::new(doc.to_string()); - let area = Rect::new(completion_area.x, completion_area.y - 3, BASE_WIDTH * 3, 3); + let viewport = area; + let area = viewport.intersection(Rect::new( + completion_area.x, + completion_area.y - 3, + BASE_WIDTH * 3, + 3, + )); let background = theme.get("ui.help"); surface.clear_with(area, background); |