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

Don't allow drag event to fall through context menu

Browse source
This commit is contained in:
Julia 2022-10-18 15:00:49 -04:00
parent 4ef69c8361
commit 2661a9cc98
1 changed files with 4 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

4
crates/context_menu/src/context_menu.rs
View file

@ -315,13 +315,16 @@ impl ContextMenu {
fn render_menu(&self, cx: &mut RenderContext<Self>) -> impl Element { fn render_menu(&self, cx: &mut RenderContext<Self>) -> impl Element {
enum Menu {} enum Menu {}
enum MenuItem {} enum MenuItem {}
let style = cx.global::<Settings>().theme.context_menu.clone(); let style = cx.global::<Settings>().theme.context_menu.clone();
MouseEventHandler::<Menu>::new(0, cx, |_, cx| { MouseEventHandler::<Menu>::new(0, cx, |_, cx| {
Flex::column() Flex::column()
.with_children(self.items.iter().enumerate().map(|(ix, item)| { .with_children(self.items.iter().enumerate().map(|(ix, item)| {
match item { match item {
ContextMenuItem::Item { label, action } => { ContextMenuItem::Item { label, action } => {
let action = action.boxed_clone(); let action = action.boxed_clone();
MouseEventHandler::<MenuItem>::new(ix, cx, |state, _| { MouseEventHandler::<MenuItem>::new(ix, cx, |state, _| {
let style = let style =
style.item.style_for(state, Some(ix) == self.selected_index); style.item.style_for(state, Some(ix) == self.selected_index);
@ -350,6 +353,7 @@ impl ContextMenu {
cx.dispatch_action(Clicked); cx.dispatch_action(Clicked);
cx.dispatch_any_action(action.boxed_clone()); cx.dispatch_any_action(action.boxed_clone());
}) })
.on_drag(MouseButton::Left, |_, _| {})
.boxed() .boxed()
} }
ContextMenuItem::Separator => Empty::new() ContextMenuItem::Separator => Empty::new()