me/iced
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Prevent body events pane is picked / dragging

Browse source
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
Download patch file Download diff file Expand all files Collapse all files

13
native/src/widget/pane_grid.rs
View file

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

21
native/src/widget/pane_grid/content.rs
View file

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