Prevent body events pane is picked / dragging

This commit is contained in:
Cory Forsstrom 2021-07-27 15:41:45 -07:00
parent 2a49e415d2
commit be65a847b0
2 changed files with 24 additions and 10 deletions

View file

@ -452,17 +452,26 @@ where
_ => {} _ => {}
} }
let picked_pane = self.state.picked_pane().map(|(pane, _)| pane);
self.elements self.elements
.iter_mut() .iter_mut()
.zip(layout.children()) .zip(layout.children())
.map(|((_, pane), layout)| { .map(|((pane, content), layout)| {
pane.on_event( let is_picked = if let Some(picked_pane) = picked_pane {
picked_pane == *pane
} else {
false
};
content.on_event(
event.clone(), event.clone(),
layout, layout,
cursor_position, cursor_position,
renderer, renderer,
clipboard, clipboard,
messages, messages,
is_picked,
) )
}) })
.fold(event_status, event::Status::merge) .fold(event_status, event::Status::merge)

View file

@ -149,6 +149,7 @@ where
renderer: &Renderer, renderer: &Renderer,
clipboard: &mut dyn Clipboard, clipboard: &mut dyn Clipboard,
messages: &mut Vec<Message>, messages: &mut Vec<Message>,
is_picked: bool,
) -> event::Status { ) -> event::Status {
let mut event_status = event::Status::Ignored; let mut event_status = event::Status::Ignored;
@ -169,14 +170,18 @@ where
layout layout
}; };
let body_status = self.body.on_event( let body_status = if is_picked {
event, event::Status::Ignored
body_layout, } else {
cursor_position, self.body.on_event(
renderer, event,
clipboard, body_layout,
messages, cursor_position,
); renderer,
clipboard,
messages,
)
};
event_status.merge(body_status) event_status.merge(body_status)
} }