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

Implement Widget::mouse_interaction for Responsive

Browse source
This commit is contained in:
Héctor Ramón Jiménez 2022-01-11 14:21:38 +07:00
parent 810e086728
commit 2e255b7b91
No known key found for this signature in database
GPG key ID: 140CC052C94F138E
1 changed files with 42 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

64
native/src/widget/responsive.rs
View file

@ -1,5 +1,6 @@
use crate::event::{self, Event}; use crate::event::{self, Event};
use crate::layout::{self, Layout}; use crate::layout::{self, Layout};
use crate::mouse;
use crate::renderer; use crate::renderer;
use crate::{ use crate::{
Clipboard, Element, Hasher, Length, Point, Rectangle, Shell, Size, Widget, Clipboard, Element, Hasher, Length, Point, Rectangle, Shell, Size, Widget,
@ -74,22 +75,13 @@ where
clipboard: &mut dyn Clipboard, clipboard: &mut dyn Clipboard,
shell: &mut Shell<'_, Message>, shell: &mut Shell<'_, Message>,
) -> event::Status { ) -> event::Status {
use std::ops::DerefMut;
let mut internal = self.0.borrow_mut(); let mut internal = self.0.borrow_mut();
let Internal { content, state } = internal.deref_mut(); if internal.state.last_size != Some(internal.state.last_layout.size()) {
if state.last_size != Some(state.last_layout.size()) {
shell.invalidate_widgets(); shell.invalidate_widgets();
} }
let content = content.resolve(state, renderer); let (content, content_layout) = internal.content(layout, renderer);
let content_layout = Layout::with_offset(
layout.position() - Point::ORIGIN,
&state.last_layout,
);
content.on_event( content.on_event(
event, event,
@ -109,21 +101,29 @@ where
cursor_position: Point, cursor_position: Point,
viewport: &Rectangle, viewport: &Rectangle,
) { ) {
use std::ops::DerefMut;
let mut internal = self.0.borrow_mut(); let mut internal = self.0.borrow_mut();
let (content, content_layout) = internal.content(layout, renderer);
let Internal { content, state } = internal.deref_mut();
let content = content.resolve(state, renderer);
let content_layout = Layout::with_offset(
layout.position() - Point::ORIGIN,
&state.last_layout,
);
content.draw(renderer, style, content_layout, cursor_position, viewport) content.draw(renderer, style, content_layout, cursor_position, viewport)
} }
fn mouse_interaction(
&self,
layout: Layout<'_>,
cursor_position: Point,
viewport: &Rectangle,
renderer: &Renderer,
) -> mouse::Interaction {
let mut internal = self.0.borrow_mut();
let (content, content_layout) = internal.content(layout, renderer);
content.mouse_interaction(
content_layout,
cursor_position,
viewport,
renderer,
)
}
} }
struct Internal<'a, Message, Renderer> { struct Internal<'a, Message, Renderer> {
@ -131,6 +131,26 @@ struct Internal<'a, Message, Renderer> {
content: Content<'a, Message, Renderer>, content: Content<'a, Message, Renderer>,
} }
impl<'a, Message, Renderer> Internal<'a, Message, Renderer>
where
Renderer: crate::Renderer,
{
fn content(
&mut self,
layout: Layout<'_>,
renderer: &Renderer,
) -> (&mut Element<'a, Message, Renderer>, Layout<'_>) {
let content = self.content.resolve(&mut self.state, renderer);
let content_layout = Layout::with_offset(
layout.position() - Point::ORIGIN,
&self.state.last_layout,
);
(content, content_layout)
}
}
enum Content<'a, Message, Renderer> { enum Content<'a, Message, Renderer> {
Pending( Pending(
Option<Box<dyn FnOnce(Size) -> Element<'a, Message, Renderer> + 'a>>, Option<Box<dyn FnOnce(Size) -> Element<'a, Message, Renderer> + 'a>>,