mirrors/zed
1
0
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2025-01-12 05:15:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Use cmd-f to move focus back to the editor when find bar is focused

Browse source
This commit is contained in:
Antonio Scandurra 2022-01-30 16:30:07 +01:00
parent 9ce1eda305
commit 83423a4344
1 changed files with 9 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
crates/find/src/find.rs
View file

@ -21,6 +21,7 @@ use workspace::{ItemViewHandle, Settings, Toolbar, Workspace};
action!(Deploy, bool); action!(Deploy, bool);
action!(Cancel); action!(Cancel);
action!(FocusEditor);
action!(ToggleMode, SearchMode); action!(ToggleMode, SearchMode);
action!(GoToMatch, Direction); action!(GoToMatch, Direction);
@ -42,11 +43,13 @@ pub fn init(cx: &mut MutableAppContext) {
Binding::new("cmd-f", Deploy(true), Some("Editor && mode == full")), Binding::new("cmd-f", Deploy(true), Some("Editor && mode == full")),
Binding::new("cmd-e", Deploy(false), Some("Editor && mode == full")), Binding::new("cmd-e", Deploy(false), Some("Editor && mode == full")),
Binding::new("escape", Cancel, Some("FindBar")), Binding::new("escape", Cancel, Some("FindBar")),
Binding::new("cmd-f", FocusEditor, Some("FindBar")),
Binding::new("enter", GoToMatch(Direction::Next), Some("FindBar")), Binding::new("enter", GoToMatch(Direction::Next), Some("FindBar")),
Binding::new("shift-enter", GoToMatch(Direction::Prev), Some("FindBar")), Binding::new("shift-enter", GoToMatch(Direction::Prev), Some("FindBar")),
]); ]);
cx.add_action(FindBar::deploy); cx.add_action(FindBar::deploy);
cx.add_action(FindBar::cancel); cx.add_action(FindBar::cancel);
cx.add_action(FindBar::focus_editor);
cx.add_action(FindBar::toggle_mode); cx.add_action(FindBar::toggle_mode);
cx.add_action(FindBar::go_to_match); cx.add_action(FindBar::go_to_match);
} }
@ -306,6 +309,12 @@ impl FindBar {
.update(cx, |pane, cx| pane.hide_toolbar(cx)); .update(cx, |pane, cx| pane.hide_toolbar(cx));
} }
fn focus_editor(&mut self, _: &FocusEditor, cx: &mut ViewContext<Self>) {
if let Some(active_editor) = self.active_editor.as_ref() {
cx.focus(active_editor);
}
}
fn is_mode_enabled(&self, mode: SearchMode) -> bool { fn is_mode_enabled(&self, mode: SearchMode) -> bool {
match mode { match mode {
SearchMode::WholeWord => self.whole_word_mode, SearchMode::WholeWord => self.whole_word_mode,