Skip to content

Commit

Permalink
fix: Reset document mode when losing focus
Browse files Browse the repository at this point in the history
  • Loading branch information
archseer committed Aug 23, 2022
1 parent 7b8e4ac commit e4c9d40
Show file tree
Hide file tree
Showing 3 changed files with 28 additions and 15 deletions.
14 changes: 6 additions & 8 deletions helix-term/src/ui/editor.rs
Original file line number Diff line number Diff line change
Expand Up @@ -976,16 +976,15 @@ impl EditorView {
doc.set_selection(view_id, Selection::point(pos));
}

editor.tree.focus = view_id;
editor.focus(view_id);

return EventResult::Consumed(None);
}

if let Some((coords, view_id)) = gutter_coords_and_view(editor, row, column) {
editor.tree.focus = view_id;
editor.focus(view_id);

let view = editor.tree.get(view_id);
let doc = editor.documents.get_mut(&view.doc).unwrap();
let (view, doc) = current!(cxt.editor);

let path = match doc.path() {
Some(path) => path.clone(),
Expand Down Expand Up @@ -1064,10 +1063,9 @@ impl EditorView {

MouseEventKind::Up(MouseButton::Right) => {
if let Some((coords, view_id)) = gutter_coords_and_view(cxt.editor, row, column) {
cxt.editor.tree.focus = view_id;
cxt.editor.focus(view_id);

let view = cxt.editor.tree.get(view_id);
let doc = cxt.editor.documents.get_mut(&view.doc).unwrap();
let (view, doc) = current!(cxt.editor);
let line = coords.row + view.offset.row;
if let Ok(pos) = doc.text().try_line_to_char(line) {
doc.set_selection(view_id, Selection::point(pos));
Expand Down Expand Up @@ -1100,7 +1098,7 @@ impl EditorView {
if let Some((pos, view_id)) = pos_and_view(editor, row, column) {
let doc = editor.document_mut(editor.tree.get(view_id).doc).unwrap();
doc.set_selection(view_id, Selection::point(pos));
editor.tree.focus = view_id;
cxt.editor.focus(view_id);
commands::MappableCommand::paste_primary_clipboard_before.execute(cxt);

return EventResult::Consumed(None);
Expand Down
23 changes: 22 additions & 1 deletion helix-view/src/editor.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1091,12 +1091,33 @@ impl Editor {
};
}

pub fn focus(&mut self, view_id: ViewId) {
let prev_id = std::mem::replace(&mut self.tree.focus, view_id);

// if leaving the view: mode should reset
if prev_id != view_id {
let doc_id = self.tree.get(prev_id).doc;
self.documents.get_mut(&doc_id).unwrap().mode = Mode::Normal;
}
}

pub fn focus_next(&mut self) {
let prev_id = self.tree.focus;
self.tree.focus_next();
let id = self.tree.focus;

// if leaving the view: mode should reset
if prev_id != id {
let doc_id = self.tree.get(prev_id).doc;
self.documents.get_mut(&doc_id).unwrap().mode = Mode::Normal;
}
}

pub fn focus_direction(&mut self, direction: tree::Direction) {
self.tree.focus_direction(direction);
let current_view = self.tree.focus;
if let Some(id) = self.tree.find_split_in_direction(current_view, direction) {
self.focus(id)
}
}

pub fn swap_split_in_direction(&mut self, direction: tree::Direction) {
Expand Down
6 changes: 0 additions & 6 deletions helix-view/src/tree.rs
Original file line number Diff line number Diff line change
Expand Up @@ -504,12 +504,6 @@ impl Tree {
Some(child_id)
}

pub fn focus_direction(&mut self, direction: Direction) {
if let Some(id) = self.find_split_in_direction(self.focus, direction) {
self.focus = id;
}
}

pub fn focus_next(&mut self) {
// This function is very dumb, but that's because we don't store any parent links.
// (we'd be able to go parent.next_sibling() recursively until we find something)
Expand Down

0 comments on commit e4c9d40

Please sign in to comment.