shadowcat/iris
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

abuse macros..

Browse Source
This commit is contained in:
Shadow Cat
2025-12-20 00:26:08 -05:00
parent bae17235c6
commit fabc7d0b90
12 changed files with 125 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
core/src/widget/like.rs
View File

@@ -1,12 +1,22 @@
use crate::HasUi;
use crate::{HasUi, Ui};
use super::*;
use std::marker::Unsize;
pub trait WidgetLike<State: 'static + HasUi, Tag>: Sized {
type Widget: Widget + ?Sized + Unsize<dyn Widget> + 'static;
pub trait StateLike<State> {
fn as_state(&mut self) -> &mut State;
}
fn add(self, state: &mut State) -> WidgetHandle<Self::Widget>;
impl StateLike<Ui> for Ui {
fn as_state(&mut self) -> &mut Ui {
self
}
}
pub trait WidgetLike<State: HasUi + StateLike<State>, Tag>: Sized {
type Widget: Widget + ?Sized + Unsize<dyn Widget>;
fn add(self, state: &mut impl StateLike<State>) -> WidgetHandle<Self::Widget>;
fn with_id<W2>(
self,
@@ -18,21 +28,21 @@ pub trait WidgetLike<State: 'static + HasUi, Tag>: Sized {
}
}
fn set_root(self, state: &mut State) {
state.get_mut().root = Some(self.add(state));
fn set_root(self, state: &mut impl StateLike<State>) {
state.as_state().get_mut().root = Some(self.add(state));
}
fn handles(self, state: &mut State) -> WidgetHandles<Self::Widget> {
fn handles(self, state: &mut impl StateLike<State>) -> WidgetHandles<Self::Widget> {
self.add(state).handles()
}
}
pub trait WidgetArrLike<State, const LEN: usize, Tag> {
fn add(self, state: &mut State) -> WidgetArr<LEN>;
fn add(self, state: &mut impl StateLike<State>) -> WidgetArr<LEN>;
}
impl<State, const LEN: usize> WidgetArrLike<State, LEN, ArrTag> for WidgetArr<LEN> {
fn add(self, _: &mut State) -> WidgetArr<LEN> {
fn add(self, _: &mut impl StateLike<State>) -> WidgetArr<LEN> {
self
}
}
@@ -43,8 +53,8 @@ macro_rules! impl_widget_arr {
impl_widget_arr!($n;$($W)*;$(${concat($W,Tag)})*);
};
($n:expr;$($W:ident)*;$($Tag:ident)*) => {
impl<State: 'static + HasUi, $($W: WidgetLike<State, $Tag>,$Tag,)*> WidgetArrLike<State, $n, ($($Tag,)*)> for ($($W,)*) {
fn add(self, state: &mut State) -> WidgetArr<$n> {
impl<State: HasUi + StateLike<State>, $($W: WidgetLike<State, $Tag>,$Tag,)*> WidgetArrLike<State, $n, ($($Tag,)*)> for ($($W,)*) {
fn add(self, state: &mut impl StateLike<State>) -> WidgetArr<$n> {
#[allow(non_snake_case)]
let ($($W,)*) = self;
WidgetArr::new(