mirrors/zed
1
0
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2024-12-27 19:02:07 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

Merge pull request #2413 from zed-industries/project-search-focus

Browse source 
Preserve previous focus when re-focusing project search
This commit is contained in:
Max Brunsfeld 2023-04-25 09:33:09 -07:00 committed by GitHub
commit 3cb50ed6b7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
crates/search/src/project_search.rs
View file

@ -85,6 +85,7 @@ pub struct ProjectSearchView {
query_contains_error: bool,
active_match_index: Option<usize>,
search_id: usize,
query_editor_was_focused: bool,
}
pub struct ProjectSearchBar {
@ -218,7 +219,11 @@ impl View for ProjectSearchView {
});
if cx.is_self_focused() {
self.focus_query_editor(cx);
if self.query_editor_was_focused {
cx.focus(&self.query_editor);
} else {
cx.focus(&self.results_editor);
}
}
}
}
@ -448,6 +453,7 @@ impl ProjectSearchView {
regex,
query_contains_error: false,
active_match_index: None,
query_editor_was_focused: false,
};
this.model_changed(cx);
this
@ -549,10 +555,11 @@ impl ProjectSearchView {
}
}
fn focus_query_editor(&self, cx: &mut ViewContext<Self>) {
fn focus_query_editor(&mut self, cx: &mut ViewContext<Self>) {
self.query_editor.update(cx, |query_editor, cx| {
query_editor.select_all(&SelectAll, cx);
});
self.query_editor_was_focused = true;
cx.focus(&self.query_editor);
}
@ -561,11 +568,12 @@ impl ProjectSearchView {
.update(cx, |query_editor, cx| query_editor.set_text(query, cx));
}
fn focus_results_editor(&self, cx: &mut ViewContext<Self>) {
fn focus_results_editor(&mut self, cx: &mut ViewContext<Self>) {
self.query_editor.update(cx, |query_editor, cx| {
let cursor = query_editor.selections.newest_anchor().head();
query_editor.change_selections(None, cx, |s| s.select_ranges([cursor.clone()..cursor]));
});
self.query_editor_was_focused = false;
cx.focus(&self.results_editor);
}