reivilibre
/
iced-mobile
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Enable event handling within the title elements 

Shrink the pick area to avoid both the controls and the title elements.
Handle events and merge title area event status with control events.
This commit is contained in:
Clark Moody 2021-05-24 16:37:47 -05:00
parent 1a2fd4e743
commit d4c5f3ee95
2 changed files with 26 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
graphics/src/widget/pane_grid.rs
View File

@ -218,10 +218,10 @@ where
body_primitive,
],
},
if is_over_pick_area {
mouse::Interaction::Grab
} else if title_bar_interaction > body_interaction {
if title_bar_interaction > body_interaction {
title_bar_interaction
} else if is_over_pick_area {
mouse::Interaction::Grab
} else {
body_interaction
},

33
native/src/widget/pane_grid/title_bar.rs
View File

@ -129,15 +129,16 @@ where
if layout.bounds().contains(cursor_position) {
let mut children = layout.children();
let padded = children.next().unwrap();
let mut children = padded.children();
let title_layout = children.next().unwrap();
if self.controls.is_some() {
let mut children = padded.children();
let _ = children.next().unwrap();
let controls_layout = children.next().unwrap();
!controls_layout.bounds().contains(cursor_position)
&& !title_layout.bounds().contains(cursor_position)
} else {
true
!title_layout.bounds().contains(cursor_position)
}
} else {
false
@ -205,16 +206,17 @@ where
clipboard: &mut dyn Clipboard,
messages: &mut Vec<Message>,
) -> event::Status {
if let Some(controls) = &mut self.controls {
let mut children = layout.children();
let padded = children.next().unwrap();
let mut children = layout.children();
let padded = children.next().unwrap();
let mut children = padded.children();
let _ = children.next();
let mut children = padded.children();
let title_layout = children.next().unwrap();
let control_status = if let Some(controls) = &mut self.controls {
let controls_layout = children.next().unwrap();
controls.on_event(
event,
event.clone(),
controls_layout,
cursor_position,
renderer,
@ -223,6 +225,17 @@ where
)
} else {
event::Status::Ignored
}
};
let title_status = self.content.on_event(
event,
title_layout,
cursor_position,
renderer,
clipboard,
messages,
);
control_status.merge(title_status)
}
}