mirror/ helix
1
0
Fork 0
mirror of https://github.com/helix-editor/helix synced 2024-06-01 07:46:05 +02:00
Code Issues

Don't render selections/cursors on views not in focus.

This commit is contained in:
Blaž Hrastnik 2021-02-04 16:49:55 +09:00
parent 448c1abba0
commit 446a7e5743
2 changed files with 24 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
helix-term/src/ui/editor.rs
View File

@ -36,6 +36,7 @@ pub fn render_view(
viewport: Rect,
surface: &mut Surface,
theme: &Theme,
is_focused: bool,
) {
let area = Rect::new(
viewport.x + OFFSET,
@ -43,14 +44,14 @@ pub fn render_view(
viewport.width - OFFSET,
viewport.height - 2,
); // - 2 for statusline and prompt
self.render_buffer(view, area, surface, theme);
self.render_buffer(view, area, surface, theme, is_focused);
// clear with background color
// TODO: this seems to prevent setting style later
// surface.set_style(viewport, theme.get("ui.background"));
let area = Rect::new(viewport.x, viewport.height - 2, viewport.width, 1);
self.render_statusline(&view.doc, area, surface, theme);
self.render_statusline(&view.doc, area, surface, theme, is_focused);
}
// TODO: ideally not &mut View but highlights require it because of cursor cache
@ -60,6 +61,7 @@ pub fn render_buffer(
viewport: Rect,
surface: &mut Surface,
theme: &Theme,
is_focused: bool,
) {
// TODO: inefficient, should feed chunks.iter() to tree_sitter.parse_with(|offset, pos|)
let source_code = view.doc.text().to_string();
@ -93,16 +95,20 @@ pub fn render_buffer(
let mut spans = Vec::new();
let mut visual_x = 0;
let mut line = 0u16;
let visible_selections: Vec<Range> = view
.doc
.state
.selection()
.ranges()
.iter()
// TODO: limit selection to one in viewport
// .filter(|range| !range.is_empty()) // && range.overlaps(&Range::new(start, end + 1))
.copied()
.collect();
let visible_selections: Vec<Range> = if is_focused {
view.doc
.state
.selection()
.ranges()
.iter()
// TODO: limit selection to one in viewport
// .filter(|range| !range.is_empty()) // && range.overlaps(&Range::new(start, end + 1))
.copied()
.collect()
} else {
// don't render selections on unfocused windows
Vec::new()
};
'outer: for event in highlights {
match event.unwrap() {
@ -233,6 +239,7 @@ pub fn render_statusline(
viewport: Rect,
surface: &mut Surface,
theme: &Theme,
is_focused: bool,
) {
let text_color = text_color();
let mode = match doc.mode() {
@ -322,9 +329,9 @@ fn render(&self, area: Rect, surface: &mut Surface, cx: &mut Context) {
// SAFETY: we cheat around the view_mut() borrow because it doesn't allow us to also borrow
// theme. Theme is immutable mutating view won't disrupt theme_ref.
let theme_ref = unsafe { &*(&cx.editor.theme as *const Theme) };
for view in cx.editor.tree.views() {
for (view, is_focused) in cx.editor.tree.views() {
// TODO: use parent area
self.render_view(view, view.area, surface, theme_ref);
self.render_view(view, view.area, surface, theme_ref, is_focused);
}
// TODO: drop unwrap

9
helix-view/src/editor.rs
View File

@ -10,7 +10,6 @@
pub struct Editor {
pub tree: Tree,
// pub documents: Vec<Document>,
pub focus: Key,
pub should_close: bool,
pub theme: Theme, // TODO: share one instance
pub language_servers: helix_lsp::Registry,
@ -23,7 +22,6 @@ pub fn new(area: tui::layout::Rect) -> Self {
Self {
tree: Tree::new(area),
focus: Key::default(),
should_close: false,
theme,
language_servers,
@ -52,16 +50,15 @@ pub fn open(&mut self, path: PathBuf, executor: &smol::Executor) -> Result<(), E
}
let view = View::new(doc)?;
let pos = self.tree.insert(view);
self.focus = pos;
self.tree.insert(view);
Ok(())
}
pub fn view(&self) -> &View {
self.tree.get(self.focus)
self.tree.get(self.tree.focus)
}
pub fn view_mut(&mut self) -> &mut View {
self.tree.get_mut(self.focus)
self.tree.get_mut(self.tree.focus)
}
}