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

Address picker issues

Browse source
This commit is contained in:
K Simmons 2022-08-09 15:51:17 -07:00
parent 6f180ed822
commit f5a6a112c8
9 changed files with 24 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
crates/command_palette/src/command_palette.rs
View file

@ -134,9 +134,11 @@ impl View for CommandPalette {
} }
fn on_focus_in(&mut self, _: AnyViewHandle, cx: &mut ViewContext<Self>) { fn on_focus_in(&mut self, _: AnyViewHandle, cx: &mut ViewContext<Self>) {
if cx.is_self_focused() {
cx.focus(&self.picker); cx.focus(&self.picker);
} }
} }
}
impl PickerDelegate for CommandPalette { impl PickerDelegate for CommandPalette {
fn match_count(&self) -> usize { fn match_count(&self) -> usize {

2
crates/file_finder/src/file_finder.rs
View file

@ -54,9 +54,11 @@ impl View for FileFinder {
} }
fn on_focus_in(&mut self, _: AnyViewHandle, cx: &mut ViewContext<Self>) { fn on_focus_in(&mut self, _: AnyViewHandle, cx: &mut ViewContext<Self>) {
if cx.is_self_focused() {
cx.focus(&self.picker); cx.focus(&self.picker);
} }
} }
}
impl FileFinder { impl FileFinder {
fn labels_for_match(&self, path_match: &PathMatch) -> (String, Vec<usize>, String, Vec<usize>) { fn labels_for_match(&self, path_match: &PathMatch) -> (String, Vec<usize>, String, Vec<usize>) {

2
crates/outline/src/outline.rs
View file

@ -53,9 +53,11 @@ impl View for OutlineView {
} }
fn on_focus_in(&mut self, _: AnyViewHandle, cx: &mut ViewContext<Self>) { fn on_focus_in(&mut self, _: AnyViewHandle, cx: &mut ViewContext<Self>) {
if cx.is_self_focused() {
cx.focus(&self.picker); cx.focus(&self.picker);
} }
} }
}
impl OutlineView { impl OutlineView {
fn new( fn new(

2
crates/picker/src/picker.rs
View file

@ -119,9 +119,11 @@ impl<D: PickerDelegate> View for Picker<D> {
} }
fn on_focus_in(&mut self, _: AnyViewHandle, cx: &mut ViewContext<Self>) { fn on_focus_in(&mut self, _: AnyViewHandle, cx: &mut ViewContext<Self>) {
if cx.is_self_focused() {
cx.focus(&self.query_editor); cx.focus(&self.query_editor);
} }
} }
}
impl<D: PickerDelegate> Picker<D> { impl<D: PickerDelegate> Picker<D> {
pub fn init(cx: &mut MutableAppContext) { pub fn init(cx: &mut MutableAppContext) {

2
crates/project_symbols/src/project_symbols.rs
View file

@ -52,9 +52,11 @@ impl View for ProjectSymbolsView {
} }
fn on_focus_in(&mut self, _: AnyViewHandle, cx: &mut ViewContext<Self>) { fn on_focus_in(&mut self, _: AnyViewHandle, cx: &mut ViewContext<Self>) {
if cx.is_self_focused() {
cx.focus(&self.picker); cx.focus(&self.picker);
} }
} }
}
impl ProjectSymbolsView { impl ProjectSymbolsView {
fn new(project: ModelHandle<Project>, cx: &mut ViewContext<Self>) -> Self { fn new(project: ModelHandle<Project>, cx: &mut ViewContext<Self>) -> Self {

2
crates/search/src/buffer_search.rs
View file

@ -81,8 +81,10 @@ impl View for BufferSearchBar {
} }
fn on_focus_in(&mut self, _: AnyViewHandle, cx: &mut ViewContext<Self>) { fn on_focus_in(&mut self, _: AnyViewHandle, cx: &mut ViewContext<Self>) {
if cx.is_self_focused() {
cx.focus(&self.query_editor); cx.focus(&self.query_editor);
} }
}
fn render(&mut self, cx: &mut RenderContext<Self>) -> ElementBox { fn render(&mut self, cx: &mut RenderContext<Self>) -> ElementBox {
let theme = cx.global::<Settings>().theme.clone(); let theme = cx.global::<Settings>().theme.clone();

2
crates/terminal/src/terminal_view.rs
View file

@ -153,8 +153,10 @@ impl View for TerminalView {
} }
fn on_focus_in(&mut self, _: AnyViewHandle, cx: &mut ViewContext<Self>) { fn on_focus_in(&mut self, _: AnyViewHandle, cx: &mut ViewContext<Self>) {
if cx.is_self_focused() {
cx.focus(self.content.handle()); cx.focus(self.content.handle());
} }
}
fn keymap_context(&self, _: &gpui::AppContext) -> gpui::keymap::Context { fn keymap_context(&self, _: &gpui::AppContext) -> gpui::keymap::Context {
let mut context = Self::default_keymap_context(); let mut context = Self::default_keymap_context();

2
crates/theme_selector/src/theme_selector.rs
View file

@ -250,6 +250,8 @@ impl View for ThemeSelector {
} }
fn on_focus_in(&mut self, _: AnyViewHandle, cx: &mut ViewContext<Self>) { fn on_focus_in(&mut self, _: AnyViewHandle, cx: &mut ViewContext<Self>) {
if cx.is_self_focused() {
cx.focus(&self.picker); cx.focus(&self.picker);
} }
} }
}

1
crates/workspace/src/workspace.rs
View file

@ -2476,7 +2476,6 @@ impl View for Workspace {
fn on_focus_in(&mut self, _: AnyViewHandle, cx: &mut ViewContext<Self>) { fn on_focus_in(&mut self, _: AnyViewHandle, cx: &mut ViewContext<Self>) {
if cx.is_self_focused() { if cx.is_self_focused() {
println!("Active Pane Focused");
cx.focus(&self.active_pane); cx.focus(&self.active_pane);
} }
} }