Create iced_lazy and draft Component trait
This commit is contained in:
parent
d9f970ffd5
commit
bffa7203df
5 changed files with 201 additions and 0 deletions
|
|
@ -57,6 +57,7 @@ members = [
|
||||||
"graphics",
|
"graphics",
|
||||||
"glow",
|
"glow",
|
||||||
"glutin",
|
"glutin",
|
||||||
|
"lazy",
|
||||||
"native",
|
"native",
|
||||||
"style",
|
"style",
|
||||||
"web",
|
"web",
|
||||||
|
|
|
||||||
11
lazy/Cargo.toml
Normal file
11
lazy/Cargo.toml
Normal file
|
|
@ -0,0 +1,11 @@
|
||||||
|
[package]
|
||||||
|
name = "iced_lazy"
|
||||||
|
version = "0.1.0"
|
||||||
|
edition = "2021"
|
||||||
|
|
||||||
|
[dependencies]
|
||||||
|
ouroboros = "0.13"
|
||||||
|
|
||||||
|
[dependencies.iced_native]
|
||||||
|
version = "0.4"
|
||||||
|
path = "../native"
|
||||||
181
lazy/src/component.rs
Normal file
181
lazy/src/component.rs
Normal file
|
|
@ -0,0 +1,181 @@
|
||||||
|
use iced_native::event;
|
||||||
|
use iced_native::layout::{self, Layout};
|
||||||
|
use iced_native::mouse;
|
||||||
|
use iced_native::overlay;
|
||||||
|
use iced_native::renderer;
|
||||||
|
use iced_native::{
|
||||||
|
Clipboard, Element, Hasher, Length, Point, Rectangle, Widget,
|
||||||
|
};
|
||||||
|
|
||||||
|
use ouroboros::self_referencing;
|
||||||
|
use std::marker::PhantomData;
|
||||||
|
|
||||||
|
pub fn view<'a, Event, Message, Renderer>(
|
||||||
|
component: &'a mut dyn Component<Message, Renderer, Event = Event>,
|
||||||
|
) -> Element<'a, Message, Renderer>
|
||||||
|
where
|
||||||
|
Renderer: iced_native::Renderer,
|
||||||
|
{
|
||||||
|
Element::new(Instance {
|
||||||
|
state: Some(
|
||||||
|
StateBuilder {
|
||||||
|
component,
|
||||||
|
cache_builder: |state| Cache {
|
||||||
|
element: state.view(),
|
||||||
|
message: PhantomData,
|
||||||
|
},
|
||||||
|
}
|
||||||
|
.build(),
|
||||||
|
),
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
pub trait Component<Message, Renderer> {
|
||||||
|
type Event;
|
||||||
|
|
||||||
|
fn update(&mut self, event: Self::Event) -> Option<Message>;
|
||||||
|
|
||||||
|
fn view(&mut self) -> Element<Self::Event, Renderer>;
|
||||||
|
}
|
||||||
|
|
||||||
|
struct Instance<'a, Message, Renderer, Event> {
|
||||||
|
state: Option<State<'a, Message, Renderer, Event>>,
|
||||||
|
}
|
||||||
|
|
||||||
|
#[self_referencing]
|
||||||
|
struct State<'a, Message, Renderer, Event> {
|
||||||
|
component: &'a mut dyn Component<Message, Renderer, Event = Event>,
|
||||||
|
|
||||||
|
#[borrows(mut component)]
|
||||||
|
#[covariant]
|
||||||
|
cache: Cache<'this, Message, Renderer, Event>,
|
||||||
|
}
|
||||||
|
|
||||||
|
struct Cache<'a, Message, Renderer, Event> {
|
||||||
|
element: Element<'a, Event, Renderer>,
|
||||||
|
message: PhantomData<Message>,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl<'a, Message, Renderer, Event> Widget<Message, Renderer>
|
||||||
|
for Instance<'a, Message, Renderer, Event>
|
||||||
|
where
|
||||||
|
Renderer: iced_native::Renderer,
|
||||||
|
{
|
||||||
|
fn width(&self) -> Length {
|
||||||
|
self.state.as_ref().unwrap().borrow_cache().element.width()
|
||||||
|
}
|
||||||
|
|
||||||
|
fn height(&self) -> Length {
|
||||||
|
self.state.as_ref().unwrap().borrow_cache().element.width()
|
||||||
|
}
|
||||||
|
|
||||||
|
fn layout(
|
||||||
|
&self,
|
||||||
|
renderer: &Renderer,
|
||||||
|
limits: &layout::Limits,
|
||||||
|
) -> layout::Node {
|
||||||
|
self.state
|
||||||
|
.as_ref()
|
||||||
|
.unwrap()
|
||||||
|
.borrow_cache()
|
||||||
|
.element
|
||||||
|
.layout(renderer, limits)
|
||||||
|
}
|
||||||
|
|
||||||
|
fn on_event(
|
||||||
|
&mut self,
|
||||||
|
event: iced_native::Event,
|
||||||
|
layout: Layout<'_>,
|
||||||
|
cursor_position: Point,
|
||||||
|
renderer: &Renderer,
|
||||||
|
clipboard: &mut dyn Clipboard,
|
||||||
|
messages: &mut Vec<Message>,
|
||||||
|
) -> event::Status {
|
||||||
|
let mut local_messages = Vec::new();
|
||||||
|
|
||||||
|
let event_status =
|
||||||
|
self.state.as_mut().unwrap().with_cache_mut(|cache| {
|
||||||
|
cache.element.on_event(
|
||||||
|
event,
|
||||||
|
layout,
|
||||||
|
cursor_position,
|
||||||
|
renderer,
|
||||||
|
clipboard,
|
||||||
|
&mut local_messages,
|
||||||
|
)
|
||||||
|
});
|
||||||
|
|
||||||
|
if !local_messages.is_empty() {
|
||||||
|
let component = self.state.take().unwrap().into_heads().component;
|
||||||
|
|
||||||
|
messages.extend(
|
||||||
|
local_messages
|
||||||
|
.into_iter()
|
||||||
|
.filter_map(|message| component.update(message)),
|
||||||
|
);
|
||||||
|
|
||||||
|
self.state = Some(
|
||||||
|
StateBuilder {
|
||||||
|
component,
|
||||||
|
cache_builder: |state| Cache {
|
||||||
|
element: state.view(),
|
||||||
|
message: PhantomData,
|
||||||
|
},
|
||||||
|
}
|
||||||
|
.build(),
|
||||||
|
);
|
||||||
|
|
||||||
|
// TODO: Invalidate layout (!)
|
||||||
|
}
|
||||||
|
|
||||||
|
event_status
|
||||||
|
}
|
||||||
|
|
||||||
|
fn draw(
|
||||||
|
&self,
|
||||||
|
renderer: &mut Renderer,
|
||||||
|
style: &renderer::Style,
|
||||||
|
layout: Layout<'_>,
|
||||||
|
cursor_position: Point,
|
||||||
|
viewport: &Rectangle,
|
||||||
|
) {
|
||||||
|
self.state.as_ref().unwrap().borrow_cache().element.draw(
|
||||||
|
renderer,
|
||||||
|
style,
|
||||||
|
layout,
|
||||||
|
cursor_position,
|
||||||
|
viewport,
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
fn hash_layout(&self, state: &mut Hasher) {
|
||||||
|
self.state
|
||||||
|
.as_ref()
|
||||||
|
.unwrap()
|
||||||
|
.borrow_cache()
|
||||||
|
.element
|
||||||
|
.hash_layout(state)
|
||||||
|
}
|
||||||
|
|
||||||
|
fn mouse_interaction(
|
||||||
|
&self,
|
||||||
|
layout: Layout<'_>,
|
||||||
|
cursor_position: Point,
|
||||||
|
viewport: &Rectangle,
|
||||||
|
) -> mouse::Interaction {
|
||||||
|
self.state
|
||||||
|
.as_ref()
|
||||||
|
.unwrap()
|
||||||
|
.borrow_cache()
|
||||||
|
.element
|
||||||
|
.mouse_interaction(layout, cursor_position, viewport)
|
||||||
|
}
|
||||||
|
|
||||||
|
fn overlay(
|
||||||
|
&mut self,
|
||||||
|
_layout: Layout<'_>,
|
||||||
|
) -> Option<overlay::Element<'_, Message, Renderer>> {
|
||||||
|
// TODO: Rethink overlay composability
|
||||||
|
None
|
||||||
|
}
|
||||||
|
}
|
||||||
3
lazy/src/lib.rs
Normal file
3
lazy/src/lib.rs
Normal file
|
|
@ -0,0 +1,3 @@
|
||||||
|
pub mod component;
|
||||||
|
|
||||||
|
pub use component::Component;
|
||||||
|
|
@ -25,6 +25,11 @@ where
|
||||||
Self { position, overlay }
|
Self { position, overlay }
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// Returns the position of the [`Element`].
|
||||||
|
pub fn position(&self) -> Point {
|
||||||
|
self.position
|
||||||
|
}
|
||||||
|
|
||||||
/// Translates the [`Element`].
|
/// Translates the [`Element`].
|
||||||
pub fn translate(mut self, translation: Vector) -> Self {
|
pub fn translate(mut self, translation: Vector) -> Self {
|
||||||
self.position = self.position + translation;
|
self.position = self.position + translation;
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue