From 28da5b4afcb5e85c4bf20ebcee91a1dffbef607b Mon Sep 17 00:00:00 2001 From: Keith Simmons Date: Mon, 11 Apr 2022 17:05:24 -0700 Subject: [PATCH] Don't focus active editor when deploying project search and focus query editor on project search focus --- crates/search/src/project_search.rs | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/crates/search/src/project_search.rs b/crates/search/src/project_search.rs index f96e3c84d1979b99e414f1b028dcd927f3ae4102..03fb99a972b783c09944505acc9fa88b3b062335 100644 --- a/crates/search/src/project_search.rs +++ b/crates/search/src/project_search.rs @@ -177,11 +177,7 @@ impl View for ProjectSearchView { .insert(self.model.read(cx).project.downgrade(), handle) }); - if self.model.read(cx).match_ranges.is_empty() { - cx.focus(&self.query_editor); - } else { - self.focus_results_editor(cx); - } + self.focus_query_editor(cx); } } @@ -390,6 +386,7 @@ impl ProjectSearchView { if let Some(existing) = existing { workspace.activate_item(&existing, cx); + existing.update(cx, |existing, cx| existing.focus_query_editor(cx)); } else { let model = cx.add_model(|cx| ProjectSearch::new(workspace.project().clone(), cx)); workspace.add_item(