RE ADD CONTEXT

src/widget/trait_fns.rs

@@ -2,30 +2,28 @@ use super::*;
 use crate::prelude::*;
 
 // these methods should "not require any context" (require unit) because they're in core
-event_ctx!(());
-
 widget_trait! {
-    pub trait CoreWidget;
+    pub trait CoreWidget<State: HasUi + 'static>;
 
-    fn pad(self, padding: impl Into<Padding>) -> impl WidgetFn<Pad> {
+    fn pad(self, padding: impl Into<Padding>) -> impl WidgetFn<State, Pad<State>> {
         |ui| Pad {
             padding: padding.into(),
             inner: self.add(ui),
         }
     }
 
-    fn align(self, align: impl Into<Align>) -> impl WidgetFn<Aligned> {
+    fn align(self, align: impl Into<Align>) -> impl WidgetFn<State, Aligned<State>> {
         move |ui| Aligned {
             inner: self.add(ui),
             align: align.into(),
         }
     }
 
-    fn center(self) -> impl WidgetFn<Aligned> {
+    fn center(self) -> impl WidgetFn<State, Aligned<State>> {
         self.align(Align::CENTER)
     }
 
-    fn label(self, label: impl Into<String>) -> impl WidgetIdFn<WL::Widget> {
+    fn label(self, label: impl Into<String>) -> impl WidgetIdFn<State, WL::Widget> {
         |ui| {
             let id = self.add(ui);
             ui.set_label(&id, label.into());
@@ -33,7 +31,7 @@ widget_trait! {
         }
     }
 
-    fn sized(self, size: impl Into<Size>) -> impl WidgetFn<Sized> {
+    fn sized(self, size: impl Into<Size>) -> impl WidgetFn<State, Sized<State>> {
         let size = size.into();
         move |ui| Sized {
             inner: self.add(ui),
@@ -42,7 +40,7 @@ widget_trait! {
         }
     }
 
-    fn max_width(self, len: impl Into<Len>) -> impl WidgetFn<MaxSize> {
+    fn max_width(self, len: impl Into<Len>) -> impl WidgetFn<State, MaxSize<State>> {
         let len = len.into();
         move |ui| MaxSize {
             inner: self.add(ui),
@@ -51,7 +49,7 @@ widget_trait! {
         }
     }
 
-    fn max_height(self, len: impl Into<Len>) -> impl WidgetFn<MaxSize> {
+    fn max_height(self, len: impl Into<Len>) -> impl WidgetFn<State, MaxSize<State>> {
         let len = len.into();
         move |ui| MaxSize {
             inner: self.add(ui),
@@ -60,7 +58,7 @@ widget_trait! {
         }
     }
 
-    fn width(self, len: impl Into<Len>) -> impl WidgetFn<Sized> {
+    fn width(self, len: impl Into<Len>) -> impl WidgetFn<State, Sized<State>> {
         let len = len.into();
         move |ui| Sized {
             inner: self.add(ui),
@@ -69,7 +67,7 @@ widget_trait! {
         }
     }
 
-    fn height(self, len: impl Into<Len>) -> impl WidgetFn<Sized> {
+    fn height(self, len: impl Into<Len>) -> impl WidgetFn<State, Sized<State>> {
         let len = len.into();
         move |ui| Sized {
             inner: self.add(ui),
@@ -78,66 +76,69 @@ widget_trait! {
         }
     }
 
-    fn offset(self, amt: impl Into<UiVec2>) -> impl WidgetFn<Offset> {
+    fn offset(self, amt: impl Into<UiVec2>) -> impl WidgetFn<State, Offset<State>> {
         move |ui| Offset {
             inner: self.add(ui),
             amt: amt.into(),
         }
     }
 
-    fn scroll(self) -> impl WidgetIdFn<Scroll> {
+    fn scroll(self) -> impl WidgetIdFn<State, Scroll<State>> {
+        use eventable::*;
         move |ui| {
             Scroll::new(self.add(ui), Axis::Y)
                 .on(CursorSense::Scroll, |ctx| {
-                    let s = &mut ctx.ui[ctx.widget];
+                    let s = &mut ctx.state.ui()[ctx.widget];
                     s.scroll(ctx.data.scroll_delta.y * 50.0);
                 })
                 .add(ui)
         }
     }
 
-    fn masked(self) -> impl WidgetFn<Masked> {
+    fn masked(self) -> impl WidgetFn<State, Masked<State>> {
         move |ui| Masked {
             inner: self.add(ui),
         }
     }
 
-    fn background<T>(self, w: impl WidgetLike<T>) -> impl WidgetFn<Stack> {
+    fn background<T>(self, w: impl WidgetLike<State, T>) -> impl WidgetFn<State, Stack<State>> {
         move |ui| Stack {
             children: vec![w.add(ui), self.add(ui)],
             size: StackSize::Child(1),
         }
     }
 
-    fn foreground<T>(self, w: impl WidgetLike<T>) -> impl WidgetFn<Stack> {
+    fn foreground<T>(self, w: impl WidgetLike<State, T>) -> impl WidgetFn<State, Stack<State>> {
         move |ui| Stack {
             children: vec![self.add(ui), w.add(ui)],
             size: StackSize::Child(0),
         }
     }
 
-    fn layer_offset(self, offset: usize) -> impl WidgetFn<LayerOffset> {
+    fn layer_offset(self, offset: usize) -> impl WidgetFn<State, LayerOffset<State>> {
         move |ui| LayerOffset {
             inner: self.add(ui),
             offset,
         }
     }
 
-    fn to_any(self) -> impl WidgetIdFn {
+    fn to_any(self) -> impl WidgetIdFn<State> {
         |ui| self.add(ui)
     }
 }
 
-pub trait CoreWidgetArr<const LEN: usize, Wa: WidgetArrLike<LEN, Tag>, Tag> {
-    fn span(self, dir: Dir) -> SpanBuilder<LEN, Wa, Tag>;
-    fn stack(self) -> StackBuilder<LEN, Wa, Tag>;
+pub trait CoreWidgetArr<State, const LEN: usize, Wa: WidgetArrLike<State, LEN, Tag>, Tag> {
+    fn span(self, dir: Dir) -> SpanBuilder<State, LEN, Wa, Tag>;
+    fn stack(self) -> StackBuilder<State, LEN, Wa, Tag>;
 }
 
-impl<const LEN: usize, Wa: WidgetArrLike<LEN, Tag>, Tag> CoreWidgetArr<LEN, Wa, Tag> for Wa {
-    fn span(self, dir: Dir) -> SpanBuilder<LEN, Wa, Tag> {
+impl<State, const LEN: usize, Wa: WidgetArrLike<State, LEN, Tag>, Tag>
+    CoreWidgetArr<State, LEN, Wa, Tag> for Wa
+{
+    fn span(self, dir: Dir) -> SpanBuilder<State, LEN, Wa, Tag> {
         SpanBuilder::new(self, dir)
     }
-    fn stack(self) -> StackBuilder<LEN, Wa, Tag> {
+    fn stack(self) -> StackBuilder<State, LEN, Wa, Tag> {
         StackBuilder::new(self)
     }
 }