unspeaker/tek
1
0
Fork 0
mirror of https://codeberg.org/unspeaker/tek.git synced 2025-12-08 04:36:45 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

wip: removing Render and Layout from core

Browse source
This commit is contained in:
🪞👃🪞 2024-09-09 15:12:34 +03:00
parent c4a5ee7b6e
commit eeb323b742
11 changed files with 148 additions and 165 deletions
Download patch file Download diff file Expand all files Collapse all files

41
crates/tek_core/src/engine/collect.rs
View file

@ -1,25 +1,24 @@
use crate::*;
pub enum Collected<'a, E: Engine> {
Box(Box<dyn Layout<E> + 'a>),
Ref(&'a (dyn Layout<E> + 'a)),
Box(Box<dyn Widget<Engine = E> + 'a>),
Ref(&'a (dyn Widget<Engine = E> + 'a)),
}
impl<'a, E: Engine> Render<E> for Collected<'a, E> {
fn render (&self, to: &mut E) -> Perhaps<E::Rendered> {
match self {
Self::Box(inner) => (*inner).render(to),
Self::Ref(inner) => (*inner).render(to),
}
}
}
impl<'a, E: Engine> Layout<E> for Collected<'a, E> {
impl<'a, E: Engine> Widget for Collected<'a, E> {
type Engine = E;
fn layout (&self, area: E::Area) -> Perhaps<E::Area> {
match self {
Self::Box(inner) => (*inner).layout(area),
Self::Ref(inner) => (*inner).layout(area),
}
}
fn render (&self, to: &mut E) -> Perhaps<E::Rendered> {
match self {
Self::Box(inner) => (*inner).render(to),
Self::Ref(inner) => (*inner).render(to),
}
}
}
pub struct Collection<'a, E: Engine>(
@ -33,9 +32,9 @@ impl<'a, E: Engine> Collection<'a, E> {
}
pub trait Collect<'a, E: Engine> {
fn add_box (self, item: Box<dyn Layout<E> + 'a>) -> Self;
fn add_ref (self, item: &'a dyn Layout<E>) -> Self;
fn add <R: Layout<E> + Sized + 'a> (self, item: R) -> Self
fn add_box (self, item: Box<dyn Widget<Engine = E> + 'a>) -> Self;
fn add_ref (self, item: &'a dyn Widget<Engine = E>) -> Self;
fn add <R: Widget<Engine = E> + Sized + 'a> (self, item: R) -> Self
where Self: Sized
{
self.add_box(Box::new(item))
@ -43,17 +42,17 @@ pub trait Collect<'a, E: Engine> {
}
impl<'a, E: Engine> Collect<'a, E> for Collection<'a, E> {
fn add_box (mut self, item: Box<dyn Layout<E> + 'a>) -> Self {
fn add_box (mut self, item: Box<dyn Widget<Engine = E> + 'a>) -> Self {
self.0.push(Collected::Box(item));
self
}
fn add_ref (mut self, item: &'a dyn Layout<E>) -> Self {
fn add_ref (mut self, item: &'a dyn Widget<Engine = E>) -> Self {
self.0.push(Collected::Ref(item));
self
}
}
pub struct Layers<'a, E: Engine>(pub &'a [&'a dyn Layout<E>]);
pub struct Layers<'a, E: Engine>(pub &'a [&'a dyn Widget<Engine = E>]);
// this actually works, except for the type inference
//pub struct Layers<'a, E: Engine + 'a, I: std::iter::IntoIterator<Item = &'a dyn Render<E>>>(
@ -69,11 +68,11 @@ impl<'a, E: Engine> Layered<'a, E> {
}
impl<'a, E: Engine> Collect<'a, E> for Layered<'a, E> {
fn add_box (mut self, item: Box<dyn Layout<E> + 'a>) -> Self {
fn add_box (mut self, item: Box<dyn Widget<Engine = E> + 'a>) -> Self {
self.0 = self.0.add_box(item);
self
}
fn add_ref (mut self, item: &'a dyn Layout<E>) -> Self {
fn add_ref (mut self, item: &'a dyn Widget<Engine = E>) -> Self {
self.0 = self.0.add_ref(item);
self
}
@ -118,11 +117,11 @@ impl<'a, E: Engine> Split<'a, E> {
}
impl<'a, E: Engine> Collect<'a, E> for Split<'a, E> {
fn add_box (mut self, item: Box<dyn Layout<E> + 'a>) -> Self {
fn add_box (mut self, item: Box<dyn Widget<Engine = E> + 'a>) -> Self {
self.items = self.items.add_box(item);
self
}
fn add_ref (mut self, item: &'a dyn Layout<E>) -> Self {
fn add_ref (mut self, item: &'a dyn Widget<Engine = E>) -> Self {
self.items = self.items.add_ref(item);
self
}