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

Make all pickers respect mouse clicks

Browse source
This commit is contained in:
Max Brunsfeld 2022-04-14 18:28:26 -07:00
parent c7527f92a4
commit 20657566b3
3 changed files with 45 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1,7 +1,7 @@
use editor::Editor;
use gpui::{
elements::{
ChildView, Flex, FlexItem, Label, ParentElement, ScrollTarget, UniformList,
ChildView, EventHandler, Flex, FlexItem, Label, ParentElement, ScrollTarget, UniformList,
UniformListState,
},
keymap, AppContext, Axis, Element, ElementBox, Entity, MutableAppContext, RenderContext, Task,
@ -9,7 +9,9 @@ use gpui::{
};
use settings::Settings;
use std::cmp;
use workspace::menu::{Cancel, Confirm, SelectFirst, SelectLast, SelectNext, SelectPrev};
use workspace::menu::{
Cancel, Confirm, SelectFirst, SelectIndex, SelectLast, SelectNext, SelectPrev,
};
pub struct Picker<D: PickerDelegate> {
delegate: WeakViewHandle<D>,
@ -78,6 +80,7 @@ impl<D: PickerDelegate> Picker<D> {
cx.add_action(Self::select_last);
cx.add_action(Self::select_next);
cx.add_action(Self::select_prev);
cx.add_action(Self::select_index);
cx.add_action(Self::confirm);
cx.add_action(Self::cancel);
}
@ -126,7 +129,14 @@ impl<D: PickerDelegate> Picker<D> {
let delegate = delegate.read(cx);
let selected_ix = delegate.selected_index();
range.end = cmp::min(range.end, delegate.match_count());
items.extend(range.map(move |ix| delegate.render_match(ix, ix == selected_ix, cx)));
items.extend(range.map(move |ix| {
EventHandler::new(delegate.render_match(ix, ix == selected_ix, cx))
.on_mouse_down(move |cx| {
cx.dispatch_action(SelectIndex(ix));
true
})
.boxed()
}));
},
)
.contained()
@ -181,6 +191,16 @@ impl<D: PickerDelegate> Picker<D> {
}
}
pub fn select_index(&mut self, action: &SelectIndex, cx: &mut ViewContext<Self>) {
if let Some(delegate) = self.delegate.upgrade(cx) {
let index = action.0;
delegate.update(cx, |delegate, cx| {
delegate.set_selected_index(index, cx);
delegate.confirm(cx);
});
}
}
pub fn select_last(&mut self, _: &SelectLast, cx: &mut ViewContext<Self>) {
if let Some(delegate) = self.delegate.upgrade(cx) {
let index = delegate.update(cx, |delegate, cx| {