Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Populate query and select it only if find bar isn't already deployed

Browse source
This commit is contained in:
Antonio Scandurra 2022-01-30 16:44:42 +01:00
parent 83423a4344
commit f90193beea
1 changed files with 13 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -78,9 +78,6 @@ impl View for FindBar {
} }
fn on_focus(&mut self, cx: &mut ViewContext<Self>) { fn on_focus(&mut self, cx: &mut ViewContext<Self>) {
self.query_editor.update(cx, |query_editor, cx| {
query_editor.select_all(&editor::SelectAll, cx);
});
cx.focus(&self.query_editor); cx.focus(&self.query_editor);
} }
@ -258,15 +255,18 @@ impl FindBar {
fn deploy(workspace: &mut Workspace, Deploy(focus): &Deploy, cx: &mut ViewContext<Workspace>) { fn deploy(workspace: &mut Workspace, Deploy(focus): &Deploy, cx: &mut ViewContext<Workspace>) {
let settings = workspace.settings(); let settings = workspace.settings();
workspace.active_pane().update(cx, |pane, cx| { workspace.active_pane().update(cx, |pane, cx| {
let findbar_was_visible = pane
.active_toolbar()
.map_or(false, |toolbar| toolbar.downcast::<Self>().is_some());
pane.show_toolbar(cx, |cx| FindBar::new(settings, cx)); pane.show_toolbar(cx, |cx| FindBar::new(settings, cx));
if let Some(find_bar) = pane if let Some(find_bar) = pane
.active_toolbar() .active_toolbar()
.and_then(|toolbar| toolbar.downcast::<Self>()) .and_then(|toolbar| toolbar.downcast::<Self>())
{ {
if let Some(editor) = pane if !findbar_was_visible {
.active_item() let editor = pane.active_item().unwrap().act_as::<Editor>(cx).unwrap();
.and_then(|editor| editor.act_as::<Editor>(cx))
{
let display_map = editor let display_map = editor
.update(cx, |editor, cx| editor.snapshot(cx)) .update(cx, |editor, cx| editor.snapshot(cx))
.display_snapshot; .display_snapshot;
@ -297,6 +297,12 @@ impl FindBar {
} }
if *focus { if *focus {
if !findbar_was_visible {
let query_editor = find_bar.read(cx).query_editor.clone();
query_editor.update(cx, |query_editor, cx| {
query_editor.select_all(&editor::SelectAll, cx);
});
}
cx.focus(&find_bar); cx.focus(&find_bar);
} }
} }