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

Delegate layout directly to content in MouseListener

Browse source
This commit is contained in:
Héctor Ramón Jiménez 2023-04-13 06:28:33 +02:00
parent dfc1868179
commit 28b0f7abf4
No known key found for this signature in database
GPG key ID: 140CC052C94F138E
1 changed files with 11 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

59
native/src/widget/mouse_listener.rs
View file

@ -11,8 +11,6 @@ use crate::{
Clipboard, Element, Layout, Length, Point, Rectangle, Shell, Widget, Clipboard, Element, Layout, Length, Point, Rectangle, Shell, Widget,
}; };
use std::u32;
/// Emit messages on mouse events. /// Emit messages on mouse events.
#[allow(missing_debug_implementations)] #[allow(missing_debug_implementations)]
pub struct MouseListener<'a, Message, Renderer> { pub struct MouseListener<'a, Message, Renderer> {
@ -151,17 +149,7 @@ where
renderer: &Renderer, renderer: &Renderer,
limits: &layout::Limits, limits: &layout::Limits,
) -> layout::Node { ) -> layout::Node {
layout( self.content.as_widget().layout(renderer, limits)
renderer,
limits,
Widget::<Message, Renderer>::width(self),
Widget::<Message, Renderer>::height(self),
u32::MAX,
u32::MAX,
|renderer, limits| {
self.content.as_widget().layout(renderer, limits)
},
)
} }
fn operate( fn operate(
@ -171,14 +159,12 @@ where
renderer: &Renderer, renderer: &Renderer,
operation: &mut dyn Operation<Message>, operation: &mut dyn Operation<Message>,
) { ) {
operation.container(None, &mut |operation| { self.content.as_widget().operate(
self.content.as_widget().operate( &mut tree.children[0],
&mut tree.children[0], layout,
layout.children().next().unwrap(), renderer,
renderer, operation,
operation, );
);
});
} }
fn on_event( fn on_event(
@ -194,7 +180,7 @@ where
if let event::Status::Captured = self.content.as_widget_mut().on_event( if let event::Status::Captured = self.content.as_widget_mut().on_event(
&mut tree.children[0], &mut tree.children[0],
event.clone(), event.clone(),
layout.children().next().unwrap(), layout,
cursor_position, cursor_position,
renderer, renderer,
clipboard, clipboard,
@ -223,7 +209,7 @@ where
) -> mouse::Interaction { ) -> mouse::Interaction {
self.content.as_widget().mouse_interaction( self.content.as_widget().mouse_interaction(
&tree.children[0], &tree.children[0],
layout.children().next().unwrap(), layout,
cursor_position, cursor_position,
viewport, viewport,
renderer, renderer,
@ -245,7 +231,7 @@ where
renderer, renderer,
theme, theme,
renderer_style, renderer_style,
layout.children().next().unwrap(), layout,
cursor_position, cursor_position,
viewport, viewport,
); );
@ -259,7 +245,7 @@ where
) -> Option<overlay::Element<'b, Message, Renderer>> { ) -> Option<overlay::Element<'b, Message, Renderer>> {
self.content.as_widget_mut().overlay( self.content.as_widget_mut().overlay(
&mut tree.children[0], &mut tree.children[0],
layout.children().next().unwrap(), layout,
renderer, renderer,
) )
} }
@ -378,26 +364,3 @@ fn update<Message: Clone, Renderer>(
event::Status::Ignored event::Status::Ignored
} }
/// Computes the layout of a [`MouseListener`].
pub fn layout<Renderer>(
renderer: &Renderer,
limits: &layout::Limits,
width: Length,
height: Length,
max_height: u32,
max_width: u32,
layout_content: impl FnOnce(&Renderer, &layout::Limits) -> layout::Node,
) -> layout::Node {
let limits = limits
.loose()
.max_height(max_height)
.max_width(max_width)
.width(width)
.height(height);
let content = layout_content(renderer, &limits);
let size = limits.resolve(content.size());
layout::Node::with_children(size, vec![content])
}