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

remove context from ui (again) and create weird trait for it

Browse Source
This commit is contained in:
shadow cat
2025-09-24 17:41:25 -04:00
parent 26c248dcba
commit 719bee4b31
12 changed files with 107 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
src/core/trait_fns.rs
View File

@@ -1,34 +1,34 @@
use super::*;
use crate::prelude::*;
pub trait CoreWidget<W, Ctx, Tag> {
fn pad(self, padding: impl Into<Padding>) -> impl WidgetFn<Padded, Ctx>;
fn align(self, align: Align) -> impl WidgetFn<Aligned, Ctx>;
fn center(self) -> impl WidgetFn<Aligned, Ctx>;
fn label(self, label: impl Into<String>) -> impl WidgetIdFn<W, Ctx>;
fn size(self, size: impl Into<Vec2>) -> impl WidgetFn<Sized, Ctx>;
pub trait CoreWidget<W, Tag> {
fn pad(self, padding: impl Into<Padding>) -> impl WidgetFn<Padded>;
fn align(self, align: Align) -> impl WidgetFn<Aligned>;
fn center(self) -> impl WidgetFn<Aligned>;
fn label(self, label: impl Into<String>) -> impl WidgetIdFn<W>;
fn size(self, size: impl Into<Vec2>) -> impl WidgetFn<Sized>;
}
impl<W: WidgetLike<Ctx, Tag>, Ctx, Tag> CoreWidget<W::Widget, Ctx, Tag> for W {
fn pad(self, padding: impl Into<Padding>) -> impl WidgetFn<Padded, Ctx> {
impl<W: WidgetLike<Tag>, Tag> CoreWidget<W::Widget, Tag> for W {
fn pad(self, padding: impl Into<Padding>) -> impl WidgetFn<Padded> {
|ui| Padded {
padding: padding.into(),
inner: self.add(ui).any(),
}
}
fn align(self, align: Align) -> impl WidgetFn<Aligned, Ctx> {
fn align(self, align: Align) -> impl WidgetFn<Aligned> {
move |ui| Aligned {
inner: self.add(ui).any(),
align,
}
}
fn center(self) -> impl WidgetFn<Aligned, Ctx> {
fn center(self) -> impl WidgetFn<Aligned> {
self.align(Align::Center)
}
fn label(self, label: impl Into<String>) -> impl WidgetIdFn<W::Widget, Ctx> {
fn label(self, label: impl Into<String>) -> impl WidgetIdFn<W::Widget> {
|ui| {
let id = self.add(ui);
ui.set_label(&id, label.into());
@@ -36,7 +36,7 @@ impl<W: WidgetLike<Ctx, Tag>, Ctx, Tag> CoreWidget<W::Widget, Ctx, Tag> for W {
}
}
fn size(self, size: impl Into<Vec2>) -> impl WidgetFn<Sized, Ctx> {
fn size(self, size: impl Into<Vec2>) -> impl WidgetFn<Sized> {
move |ui| Sized {
inner: self.add(ui).any(),
size: size.into(),
@@ -44,20 +44,20 @@ impl<W: WidgetLike<Ctx, Tag>, Ctx, Tag> CoreWidget<W::Widget, Ctx, Tag> for W {
}
}
pub trait CoreWidgetArr<const LEN: usize, Ctx, Tag> {
fn span(self, dir: Dir, lengths: impl IntoSpanLens<LEN>) -> impl WidgetFn<Span, Ctx>;
fn stack(self) -> impl WidgetFn<Stack, Ctx>;
pub trait CoreWidgetArr<const LEN: usize, Tag> {
fn span(self, dir: Dir, lengths: impl IntoSpanLens<LEN>) -> impl WidgetFn<Span>;
fn stack(self) -> impl WidgetFn<Stack>;
}
impl<const LEN: usize, Wa: WidgetArrLike<LEN, Ctx, Tag>, Ctx, Tag> CoreWidgetArr<LEN, Ctx, Tag> for Wa {
fn span(self, dir: Dir, lengths: impl IntoSpanLens<LEN>) -> impl WidgetFn<Span, Ctx> {
impl<const LEN: usize, Wa: WidgetArrLike<LEN, Tag>, Tag> CoreWidgetArr<LEN, Tag> for Wa {
fn span(self, dir: Dir, lengths: impl IntoSpanLens<LEN>) -> impl WidgetFn<Span> {
let lengths = lengths.into_lens();
move |ui| Span {
children: self.ui(ui).arr.into_iter().zip(lengths).collect(),
dir,
}
}
fn stack(self) -> impl WidgetFn<Stack, Ctx> {
fn stack(self) -> impl WidgetFn<Stack> {
move |ui| Stack {
children: self.ui(ui).arr.to_vec(),
}