RE ADD CONTEXT

core/src/widget/mod.rs

@@ -13,23 +13,23 @@ pub use like::*;
 pub use tag::*;
 pub use widgets::*;
 
-pub trait Widget: Any {
-    fn draw(&mut self, painter: &mut Painter);
-    fn desired_width(&mut self, ctx: &mut SizeCtx) -> Len;
-    fn desired_height(&mut self, ctx: &mut SizeCtx) -> Len;
+pub trait Widget<State>: Any {
+    fn draw(&mut self, painter: &mut Painter<State>);
+    fn desired_width(&mut self, ctx: &mut SizeCtx<State>) -> Len;
+    fn desired_height(&mut self, ctx: &mut SizeCtx<State>) -> Len;
 }
 
-impl Widget for () {
-    fn draw(&mut self, _: &mut Painter) {}
-    fn desired_width(&mut self, _: &mut SizeCtx) -> Len {
+impl<State> Widget<State> for () {
+    fn draw(&mut self, _: &mut Painter<State>) {}
+    fn desired_width(&mut self, _: &mut SizeCtx<State>) -> Len {
         Len::ZERO
     }
-    fn desired_height(&mut self, _: &mut SizeCtx) -> Len {
+    fn desired_height(&mut self, _: &mut SizeCtx<State>) -> Len {
         Len::ZERO
     }
 }
 
-impl dyn Widget {
+impl<State> dyn Widget<State> {
     pub fn as_any(&self) -> &dyn Any {
         self
     }
@@ -42,31 +42,31 @@ impl dyn Widget {
 /// A function that returns a widget given a UI.
 /// Useful for defining trait functions on widgets that create a parent widget so that the children
 /// don't need to be IDs yet
-pub trait WidgetFn<W: Widget + ?Sized>: FnOnce(&mut Ui) -> W {}
-impl<W: Widget + ?Sized, F: FnOnce(&mut Ui) -> W> WidgetFn<W> for F {}
+pub trait WidgetFn<State, W: Widget<State> + ?Sized>: FnOnce(&mut Ui<State>) -> W {}
+impl<State, W: Widget<State> + ?Sized, F: FnOnce(&mut Ui<State>) -> W> WidgetFn<State, W> for F {}
 
-pub struct WidgetArr<const LEN: usize> {
-    pub arr: [WidgetHandle; LEN],
+pub struct WidgetArr<State, const LEN: usize> {
+    pub arr: [WidgetHandle<State>; LEN],
 }
 
-impl<const LEN: usize> WidgetArr<LEN> {
-    pub fn new(arr: [WidgetHandle; LEN]) -> Self {
+impl<State, const LEN: usize> WidgetArr<State, LEN> {
+    pub fn new(arr: [WidgetHandle<State>; LEN]) -> Self {
         Self { arr }
     }
 }
 
-pub trait WidgetOption {
-    fn get(self, ui: &mut Ui) -> Option<WidgetHandle>;
+pub trait WidgetOption<State> {
+    fn get(self, ui: &mut Ui<State>) -> Option<WidgetHandle<State>>;
 }
 
-impl WidgetOption for () {
-    fn get(self, _: &mut Ui) -> Option<WidgetHandle> {
+impl<State> WidgetOption<State> for () {
+    fn get(self, _: &mut Ui<State>) -> Option<WidgetHandle<State>> {
         None
     }
 }
 
-impl<F: FnOnce(&mut Ui) -> Option<WidgetHandle>> WidgetOption for F {
-    fn get(self, ui: &mut Ui) -> Option<WidgetHandle> {
+impl<State, F: FnOnce(&mut Ui<State>) -> Option<WidgetHandle<State>>> WidgetOption<State> for F {
+    fn get(self, ui: &mut Ui<State>) -> Option<WidgetHandle<State>> {
         self(ui)
     }
 }