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

Introduce Renderer argument to mouse_interaction and on_event

Browse source
This commit is contained in:
Héctor Ramón Jiménez 2022-01-11 14:12:28 +07:00
parent 6ab4611a6e
commit 810e086728
No known key found for this signature in database
GPG key ID: 140CC052C94F138E
24 changed files with 165 additions and 58 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -205,6 +205,7 @@ where
layout: Layout<'_>,
cursor_position: Point,
viewport: &Rectangle,
renderer: &Renderer,
) -> mouse::Interaction {
let (body_layout, title_bar_interaction) =
if let Some(title_bar) = &self.title_bar {
@ -222,6 +223,7 @@ where
title_bar_layout,
cursor_position,
viewport,
renderer,
);
(children.next().unwrap(), mouse_interaction)
@ -230,7 +232,7 @@ where
};
self.body
.mouse_interaction(body_layout, cursor_position, viewport)
.mouse_interaction(body_layout, cursor_position, viewport, renderer)
.max(title_bar_interaction)
}
@ -245,17 +247,18 @@ where
pub(crate) fn overlay(
&mut self,
layout: Layout<'_>,
renderer: &Renderer,
) -> Option<overlay::Element<'_, Message, Renderer>> {
if let Some(title_bar) = self.title_bar.as_mut() {
let mut children = layout.children();
let title_bar_layout = children.next()?;
match title_bar.overlay(title_bar_layout) {
match title_bar.overlay(title_bar_layout, renderer) {
Some(overlay) => Some(overlay),
None => self.body.overlay(children.next()?),
None => self.body.overlay(children.next()?, renderer),
}
} else {
self.body.overlay(layout)
self.body.overlay(layout, renderer)
}
}
}

14
native/src/widget/pane_grid/title_bar.rs
View file

@ -258,6 +258,7 @@ where
layout: Layout<'_>,
cursor_position: Point,
viewport: &Rectangle,
renderer: &Renderer,
) -> mouse::Interaction {
let mut children = layout.children();
let padded = children.next().unwrap();
@ -269,13 +270,19 @@ where
title_layout,
cursor_position,
viewport,
renderer,
);
if let Some(controls) = &self.controls {
let controls_layout = children.next().unwrap();
controls
.mouse_interaction(controls_layout, cursor_position, viewport)
.mouse_interaction(
controls_layout,
cursor_position,
viewport,
renderer,
)
.max(title_interaction)
} else {
title_interaction
@ -285,6 +292,7 @@ where
pub(crate) fn overlay(
&mut self,
layout: Layout<'_>,
renderer: &Renderer,
) -> Option<overlay::Element<'_, Message, Renderer>> {
let mut children = layout.children();
let padded = children.next()?;
@ -296,11 +304,11 @@ where
content, controls, ..
} = self;
content.overlay(title_layout).or_else(move || {
content.overlay(title_layout, renderer).or_else(move || {
controls.as_mut().and_then(|controls| {
let controls_layout = children.next()?;
controls.overlay(controls_layout)
controls.overlay(controls_layout, renderer)
})
})
}