remove state generic from a lot of things

core/src/widget/mod.rs

@@ -1,4 +1,4 @@
-use crate::{Axis, AxisT, Len, Painter, SizeCtx, Ui};
+use crate::{Axis, AxisT, Len, Painter, SizeCtx};
 use std::any::Any;
 
 mod data;
@@ -13,18 +13,18 @@ pub use like::*;
 pub use tag::*;
 pub use widgets::*;
 
-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;
+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 WidgetAxisFns<State> {
-    fn desired_len<A: AxisT>(&mut self, ctx: &mut SizeCtx<State>) -> Len;
+pub trait WidgetAxisFns {
+    fn desired_len<A: AxisT>(&mut self, ctx: &mut SizeCtx) -> Len;
 }
 
-impl<State, W: Widget<State> + ?Sized> WidgetAxisFns<State> for W {
-    fn desired_len<A: AxisT>(&mut self, ctx: &mut SizeCtx<State>) -> Len {
+impl<W: Widget + ?Sized> WidgetAxisFns for W {
+    fn desired_len<A: AxisT>(&mut self, ctx: &mut SizeCtx) -> Len {
         match A::get() {
             Axis::X => self.desired_width(ctx),
             Axis::Y => self.desired_height(ctx),
@@ -32,17 +32,17 @@ impl<State, W: Widget<State> + ?Sized> WidgetAxisFns<State> for W {
     }
 }
 
-impl<State> Widget<State> for () {
-    fn draw(&mut self, _: &mut Painter<State>) {}
-    fn desired_width(&mut self, _: &mut SizeCtx<State>) -> Len {
+impl Widget for () {
+    fn draw(&mut self, _: &mut Painter) {}
+    fn desired_width(&mut self, _: &mut SizeCtx) -> Len {
         Len::ZERO
     }
-    fn desired_height(&mut self, _: &mut SizeCtx<State>) -> Len {
+    fn desired_height(&mut self, _: &mut SizeCtx) -> Len {
         Len::ZERO
     }
 }
 
-impl<State> dyn Widget<State> {
+impl dyn Widget {
     pub fn as_any(&self) -> &dyn Any {
         self
     }
@@ -55,31 +55,31 @@ impl<State> dyn Widget<State> {
 /// 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<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 trait WidgetFn<State, W: Widget + ?Sized>: FnOnce(&mut State) -> W {}
+impl<State, W: Widget + ?Sized, F: FnOnce(&mut State) -> W> WidgetFn<State, W> for F {}
 
-pub struct WidgetArr<State, const LEN: usize> {
-    pub arr: [WidgetHandle<State>; LEN],
+pub struct WidgetArr<const LEN: usize> {
+    pub arr: [WidgetHandle; LEN],
 }
 
-impl<State, const LEN: usize> WidgetArr<State, LEN> {
-    pub fn new(arr: [WidgetHandle<State>; LEN]) -> Self {
+impl<const LEN: usize> WidgetArr<LEN> {
+    pub fn new(arr: [WidgetHandle; LEN]) -> Self {
         Self { arr }
     }
 }
 
 pub trait WidgetOption<State> {
-    fn get(self, ui: &mut Ui<State>) -> Option<WidgetHandle<State>>;
+    fn get(self, state: &mut State) -> Option<WidgetHandle>;
 }
 
 impl<State> WidgetOption<State> for () {
-    fn get(self, _: &mut Ui<State>) -> Option<WidgetHandle<State>> {
+    fn get(self, _: &mut State) -> Option<WidgetHandle> {
         None
     }
 }
 
-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)
+impl<State, F: FnOnce(&mut State) -> Option<WidgetHandle>> WidgetOption<State> for F {
+    fn get(self, state: &mut State) -> Option<WidgetHandle> {
+        self(state)
     }
 }