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

1
graphics/src/widget/canvas.rs
View file

@ -193,6 +193,7 @@ where
layout: Layout<'_>,
cursor_position: Point,
_viewport: &Rectangle,
_renderer: &Renderer<B>,
) -> mouse::Interaction {
let bounds = layout.bounds();
let cursor = Cursor::from_window_position(cursor_position);

23
lazy/src/component.rs
View file

@ -214,15 +214,22 @@ where
layout: Layout<'_>,
cursor_position: Point,
viewport: &Rectangle,
renderer: &Renderer,
) -> mouse::Interaction {
self.with_element(|element| {
element.mouse_interaction(layout, cursor_position, viewport)
element.mouse_interaction(
layout,
cursor_position,
viewport,
renderer,
)
})
}
fn overlay(
&mut self,
layout: Layout<'_>,
renderer: &Renderer,
) -> Option<overlay::Element<'_, Message, Renderer>> {
let has_overlay = self
.state
@ -236,7 +243,9 @@ where
CacheBuilder {
element,
message: PhantomData,
overlay_builder: |element| element.overlay(layout),
overlay_builder: |element| {
element.overlay(layout, renderer)
},
}
.build(),
);
@ -331,9 +340,15 @@ where
layout: Layout<'_>,
cursor_position: Point,
viewport: &Rectangle,
renderer: &Renderer,
) -> mouse::Interaction {
self.with_overlay_maybe(|overlay| {
overlay.mouse_interaction(layout, cursor_position, viewport)
overlay.mouse_interaction(
layout,
cursor_position,
viewport,
renderer,
)
})
.unwrap_or_default()
}
@ -397,7 +412,7 @@ where
element: state.view(),
message: PhantomData,
overlay_builder: |element| {
element.overlay(layout)
element.overlay(layout, renderer)
},
}
.build(),

37
native/src/element.rs
View file

@ -259,9 +259,14 @@ where
layout: Layout<'_>,
cursor_position: Point,
viewport: &Rectangle,
renderer: &Renderer,
) -> mouse::Interaction {
self.widget
.mouse_interaction(layout, cursor_position, viewport)
self.widget.mouse_interaction(
layout,
cursor_position,
viewport,
renderer,
)
}
/// Computes the _layout_ hash of the [`Element`].
@ -273,8 +278,9 @@ where
pub fn overlay<'b>(
&'b mut self,
layout: Layout<'_>,
renderer: &Renderer,
) -> Option<overlay::Element<'b, Message, Renderer>> {
self.widget.overlay(layout)
self.widget.overlay(layout, renderer)
}
}
@ -363,9 +369,14 @@ where
layout: Layout<'_>,
cursor_position: Point,
viewport: &Rectangle,
renderer: &Renderer,
) -> mouse::Interaction {
self.widget
.mouse_interaction(layout, cursor_position, viewport)
self.widget.mouse_interaction(
layout,
cursor_position,
viewport,
renderer,
)
}
fn hash_layout(&self, state: &mut Hasher) {
@ -375,11 +386,12 @@ where
fn overlay(
&mut self,
layout: Layout<'_>,
renderer: &Renderer,
) -> Option<overlay::Element<'_, B, Renderer>> {
let mapper = &self.mapper;
self.widget
.overlay(layout)
.overlay(layout, renderer)
.map(move |overlay| overlay.map(mapper))
}
}
@ -482,10 +494,14 @@ where
layout: Layout<'_>,
cursor_position: Point,
viewport: &Rectangle,
renderer: &Renderer,
) -> mouse::Interaction {
self.element
.widget
.mouse_interaction(layout, cursor_position, viewport)
self.element.widget.mouse_interaction(
layout,
cursor_position,
viewport,
renderer,
)
}
fn hash_layout(&self, state: &mut Hasher) {
@ -495,7 +511,8 @@ where
fn overlay(
&mut self,
layout: Layout<'_>,
renderer: &Renderer,
) -> Option<overlay::Element<'_, Message, Renderer>> {
self.element.overlay(layout)
self.element.overlay(layout, renderer)
}
}

1
native/src/overlay.rs
View file

@ -84,6 +84,7 @@ where
_layout: Layout<'_>,
_cursor_position: Point,
_viewport: &Rectangle,
_renderer: &Renderer,
) -> mouse::Interaction {
mouse::Interaction::Idle
}

18
native/src/overlay/element.rs
View file

@ -80,9 +80,14 @@ where
layout: Layout<'_>,
cursor_position: Point,
viewport: &Rectangle,
renderer: &Renderer,
) -> mouse::Interaction {
self.overlay
.mouse_interaction(layout, cursor_position, viewport)
self.overlay.mouse_interaction(
layout,
cursor_position,
viewport,
renderer,
)
}
/// Draws the [`Element`] and its children using the given [`Layout`].
@ -160,9 +165,14 @@ where
layout: Layout<'_>,
cursor_position: Point,
viewport: &Rectangle,
renderer: &Renderer,
) -> mouse::Interaction {
self.content
.mouse_interaction(layout, cursor_position, viewport)
self.content.mouse_interaction(
layout,
cursor_position,
viewport,
renderer,
)
}
fn draw(

10
native/src/overlay/menu.rs
View file

@ -239,9 +239,14 @@ where
layout: Layout<'_>,
cursor_position: Point,
viewport: &Rectangle,
renderer: &Renderer,
) -> mouse::Interaction {
self.container
.mouse_interaction(layout, cursor_position, viewport)
self.container.mouse_interaction(
layout,
cursor_position,
viewport,
renderer,
)
}
fn draw(
@ -392,6 +397,7 @@ where
layout: Layout<'_>,
cursor_position: Point,
_viewport: &Rectangle,
_renderer: &Renderer,
) -> mouse::Interaction {
let is_mouse_over = layout.bounds().contains(cursor_position);

12
native/src/user_interface.rs
View file

@ -205,7 +205,7 @@ where
let mut state = State::Updated;
let (base_cursor, overlay_statuses) = if let Some(mut overlay) =
self.root.overlay(Layout::new(&self.base.layout))
self.root.overlay(Layout::new(&self.base.layout), renderer)
{
let bounds = self.bounds;
@ -391,7 +391,7 @@ where
let viewport = Rectangle::with_size(self.bounds);
if let Some(mut overlay) =
self.root.overlay(Layout::new(&self.base.layout))
self.root.overlay(Layout::new(&self.base.layout), renderer)
{
let layer = Self::overlay_layer(
self.overlay.take(),
@ -432,6 +432,7 @@ where
Layout::new(&self.base.layout),
cursor_position,
&viewport,
renderer,
);
let Self {
@ -449,11 +450,13 @@ where
overlay
.as_ref()
.and_then(|layer| {
root.overlay(Layout::new(&base.layout)).map(|overlay| {
root.overlay(Layout::new(&base.layout), renderer).map(
|overlay| {
let overlay_interaction = overlay.mouse_interaction(
Layout::new(&layer.layout),
cursor_position,
&viewport,
renderer,
);
let overlay_bounds = layer.layout.bounds();
@ -472,7 +475,8 @@ where
} else {
base_interaction
}
})
},
)
})
.unwrap_or(base_interaction)
}

2
native/src/widget.rs
View file

@ -179,6 +179,7 @@ where
_layout: Layout<'_>,
_cursor_position: Point,
_viewport: &Rectangle,
_renderer: &Renderer,
) -> mouse::Interaction {
mouse::Interaction::Idle
}
@ -187,6 +188,7 @@ where
fn overlay(
&mut self,
_layout: Layout<'_>,
_renderer: &Renderer,
) -> Option<overlay::Element<'_, Message, Renderer>> {
None
}

5
native/src/widget/button.rs
View file

@ -253,6 +253,7 @@ where
layout: Layout<'_>,
cursor_position: Point,
_viewport: &Rectangle,
_renderer: &Renderer,
) -> mouse::Interaction {
let is_mouse_over = layout.bounds().contains(cursor_position);
let is_disabled = self.on_press.is_none();
@ -343,8 +344,10 @@ where
fn overlay(
&mut self,
layout: Layout<'_>,
renderer: &Renderer,
) -> Option<overlay::Element<'_, Message, Renderer>> {
self.content.overlay(layout.children().next().unwrap())
self.content
.overlay(layout.children().next().unwrap(), renderer)
}
}

1
native/src/widget/checkbox.rs
View file

@ -195,6 +195,7 @@ where
layout: Layout<'_>,
cursor_position: Point,
_viewport: &Rectangle,
_renderer: &Renderer,
) -> mouse::Interaction {
if layout.bounds().contains(cursor_position) {
mouse::Interaction::Pointer

7
native/src/widget/column.rs
View file

@ -169,6 +169,7 @@ where
layout: Layout<'_>,
cursor_position: Point,
viewport: &Rectangle,
renderer: &Renderer,
) -> mouse::Interaction {
self.children
.iter()
@ -178,6 +179,7 @@ where
layout,
cursor_position,
viewport,
renderer,
)
})
.max()
@ -217,11 +219,14 @@ where
fn overlay(
&mut self,
layout: Layout<'_>,
renderer: &Renderer,
) -> Option<overlay::Element<'_, Message, Renderer>> {
self.children
.iter_mut()
.zip(layout.children())
.filter_map(|(child, layout)| child.widget.overlay(layout))
.filter_map(|(child, layout)| {
child.widget.overlay(layout, renderer)
})
.next()
}
}

6
native/src/widget/container.rs
View file

@ -184,11 +184,13 @@ where
layout: Layout<'_>,
cursor_position: Point,
viewport: &Rectangle,
renderer: &Renderer,
) -> mouse::Interaction {
self.content.widget.mouse_interaction(
layout.children().next().unwrap(),
cursor_position,
viewport,
renderer,
)
}
@ -235,8 +237,10 @@ where
fn overlay(
&mut self,
layout: Layout<'_>,
renderer: &Renderer,
) -> Option<overlay::Element<'_, Message, Renderer>> {
self.content.overlay(layout.children().next().unwrap())
self.content
.overlay(layout.children().next().unwrap(), renderer)
}
}

1
native/src/widget/image/viewer.rs
View file

@ -286,6 +286,7 @@ where
layout: Layout<'_>,
cursor_position: Point,
_viewport: &Rectangle,
_renderer: &Renderer,
) -> mouse::Interaction {
let bounds = layout.bounds();
let is_mouse_over = bounds.contains(cursor_position);

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

@ -472,6 +472,7 @@ where
layout: Layout<'_>,
cursor_position: Point,
viewport: &Rectangle,
renderer: &Renderer,
) -> mouse::Interaction {
if self.state.picked_pane().is_some() {
return mouse::Interaction::Grab;
@ -511,7 +512,12 @@ where
.iter()
.zip(layout.children())
.map(|((_pane, content), layout)| {
content.mouse_interaction(layout, cursor_position, viewport)
content.mouse_interaction(
layout,
cursor_position,
viewport,
renderer,
)
})
.max()
.unwrap_or_default()
@ -678,11 +684,12 @@ where
fn overlay(
&mut self,
layout: Layout<'_>,
renderer: &Renderer,
) -> Option<overlay::Element<'_, Message, Renderer>> {
self.elements
.iter_mut()
.zip(layout.children())
.filter_map(|((_, pane), layout)| pane.overlay(layout))
.filter_map(|((_, pane), layout)| pane.overlay(layout, renderer))
.next()
}
}

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)
})
})
}

2
native/src/widget/pick_list.rs
View file

@ -331,6 +331,7 @@ where
layout: Layout<'_>,
cursor_position: Point,
_viewport: &Rectangle,
_renderer: &Renderer,
) -> mouse::Interaction {
let bounds = layout.bounds();
let is_mouse_over = bounds.contains(cursor_position);
@ -415,6 +416,7 @@ where
fn overlay(
&mut self,
layout: Layout<'_>,
_renderer: &Renderer,
) -> Option<overlay::Element<'_, Message, Renderer>> {
if *self.is_open {
let bounds = layout.bounds();

1
native/src/widget/radio.rs
View file

@ -209,6 +209,7 @@ where
layout: Layout<'_>,
cursor_position: Point,
_viewport: &Rectangle,
_renderer: &Renderer,
) -> mouse::Interaction {
if layout.bounds().contains(cursor_position) {
mouse::Interaction::Pointer

7
native/src/widget/row.rs
View file

@ -168,6 +168,7 @@ where
layout: Layout<'_>,
cursor_position: Point,
viewport: &Rectangle,
renderer: &Renderer,
) -> mouse::Interaction {
self.children
.iter()
@ -177,6 +178,7 @@ where
layout,
cursor_position,
viewport,
renderer,
)
})
.max()
@ -216,11 +218,14 @@ where
fn overlay(
&mut self,
layout: Layout<'_>,
renderer: &Renderer,
) -> Option<overlay::Element<'_, Message, Renderer>> {
self.children
.iter_mut()
.zip(layout.children())
.filter_map(|(child, layout)| child.widget.overlay(layout))
.filter_map(|(child, layout)| {
child.widget.overlay(layout, renderer)
})
.next()
}
}

5
native/src/widget/scrollable.rs
View file

@ -427,6 +427,7 @@ where
layout: Layout<'_>,
cursor_position: Point,
_viewport: &Rectangle,
renderer: &Renderer,
) -> mouse::Interaction {
let bounds = layout.bounds();
let content_layout = layout.children().next().unwrap();
@ -457,6 +458,7 @@ where
y: bounds.y + offset as f32,
..bounds
},
renderer,
)
}
}
@ -581,11 +583,12 @@ where
fn overlay(
&mut self,
layout: Layout<'_>,
renderer: &Renderer,
) -> Option<overlay::Element<'_, Message, Renderer>> {
let Self { content, state, .. } = self;
content
.overlay(layout.children().next().unwrap())
.overlay(layout.children().next().unwrap(), renderer)
.map(|overlay| {
let bounds = layout.bounds();
let content_layout = layout.children().next().unwrap();

1
native/src/widget/slider.rs
View file

@ -361,6 +361,7 @@ where
layout: Layout<'_>,
cursor_position: Point,
_viewport: &Rectangle,
_renderer: &Renderer,
) -> mouse::Interaction {
let bounds = layout.bounds();
let is_mouse_over = bounds.contains(cursor_position);

1
native/src/widget/text_input.rs
View file

@ -764,6 +764,7 @@ where
layout: Layout<'_>,
cursor_position: Point,
_viewport: &Rectangle,
_renderer: &Renderer,
) -> mouse::Interaction {
if layout.bounds().contains(cursor_position) {
mouse::Interaction::Text

1
native/src/widget/toggler.rs
View file

@ -196,6 +196,7 @@ where
layout: Layout<'_>,
cursor_position: Point,
_viewport: &Rectangle,
_renderer: &Renderer,
) -> mouse::Interaction {
if layout.bounds().contains(cursor_position) {
mouse::Interaction::Pointer

9
native/src/widget/tooltip.rs
View file

@ -147,9 +147,14 @@ where
layout: Layout<'_>,
cursor_position: Point,
viewport: &Rectangle,
renderer: &Renderer,
) -> mouse::Interaction {
self.content
.mouse_interaction(layout, cursor_position, viewport)
self.content.mouse_interaction(
layout,
cursor_position,
viewport,
renderer,
)
}
fn draw(