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

Introduce Shell type in iced_native

Browse source 
Widgets now can invalidate the current layout of the application on demand.
This commit is contained in:
Héctor Ramón Jiménez 2021-11-29 16:22:01 +07:00
parent f7792d89d6
commit bbd9355450
No known key found for this signature in database
GPG key ID: 140CC052C94F138E
26 changed files with 218 additions and 130 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -8,7 +8,7 @@ use crate::touch;
use crate::widget::Column;
use crate::{
Alignment, Background, Clipboard, Color, Element, Hasher, Layout, Length,
Padding, Point, Rectangle, Size, Vector, Widget,
Padding, Point, Rectangle, Shell, Size, Vector, Widget,
};
use std::{f32, hash::Hash, u32};
@ -144,14 +144,14 @@ impl<'a, Message, Renderer: crate::Renderer> Scrollable<'a, Message, Renderer> {
&self,
bounds: Rectangle,
content_bounds: Rectangle,
messages: &mut Vec<Message>,
shell: &mut Shell<'_, Message>,
) {
if content_bounds.height <= bounds.height {
return;
}
if let Some(on_scroll) = &self.on_scroll {
messages.push(on_scroll(
shell.publish(on_scroll(
self.state.offset.absolute(bounds, content_bounds)
/ (content_bounds.height - bounds.height),
));
@ -251,7 +251,7 @@ where
cursor_position: Point,
renderer: &Renderer,
clipboard: &mut dyn Clipboard,
messages: &mut Vec<Message>,
shell: &mut Shell<'_, Message>,
) -> event::Status {
let bounds = layout.bounds();
let is_mouse_over = bounds.contains(cursor_position);
@ -286,7 +286,7 @@ where
cursor_position,
renderer,
clipboard,
messages,
shell,
)
};
@ -307,7 +307,7 @@ where
}
}
self.notify_on_scroll(bounds, content_bounds, messages);
self.notify_on_scroll(bounds, content_bounds, shell);
return event::Status::Captured;
}
@ -336,7 +336,7 @@ where
self.notify_on_scroll(
bounds,
content_bounds,
messages,
shell,
);
}
}
@ -377,7 +377,7 @@ where
content_bounds,
);
self.notify_on_scroll(bounds, content_bounds, messages);
self.notify_on_scroll(bounds, content_bounds, shell);
return event::Status::Captured;
}
@ -409,7 +409,7 @@ where
self.notify_on_scroll(
bounds,
content_bounds,
messages,
shell,
);
return event::Status::Captured;