finished moving out render_state

src/widget/image.rs

@@ -19,10 +19,10 @@ impl Widget for Image {
     }
 }
 
-pub fn image<State: HasUi>(image: impl LoadableImage) -> impl WidgetFn<State, Image> {
+pub fn image<State: UiRsc>(image: impl LoadableImage) -> impl WidgetFn<State, Image> {
     let image = image.get_image().expect("Failed to load image");
     move |state| Image {
-        handle: state.ui_mut().add_texture(image),
+        handle: state.ui_mut().textures.add(image),
     }
 }
 

src/widget/text/build.rs

@@ -51,7 +51,7 @@ impl<State, O, H: WidgetOption<State>> TextBuilder<State, O, H> {
     }
 }
 
-impl<Rsc: HasUi, O> TextBuilder<Rsc, O> {
+impl<Rsc: UiRsc, O> TextBuilder<Rsc, O> {
     pub fn hint<W: WidgetLike<Rsc, Tag>, Tag>(
         self,
         hint: W,
@@ -75,7 +75,7 @@ pub trait TextBuilderOutput<State>: Sized {
 }
 
 pub struct TextOutput;
-impl<Rsc: HasUi> TextBuilderOutput<Rsc> for TextOutput {
+impl<Rsc: UiRsc> TextBuilderOutput<Rsc> for TextOutput {
     type Output = Text;
 
     fn run<H: WidgetOption<Rsc>>(
@@ -103,7 +103,7 @@ pub struct TextEditOutput {
     mode: EditMode,
 }
 
-impl<State: HasUi> TextBuilderOutput<State> for TextEditOutput {
+impl<State: UiRsc> TextBuilderOutput<State> for TextEditOutput {
     type Output = TextEdit;
 
     fn run<H: WidgetOption<State>>(

src/widget/text/edit.rs

@@ -617,11 +617,11 @@ impl DerefMut for TextEdit {
 }
 
 pub trait TextEditable {
-    fn edit<'a>(&self, ui: &'a mut impl HasUi) -> TextEditCtx<'a>;
+    fn edit<'a>(&self, ui: &'a mut impl UiRsc) -> TextEditCtx<'a>;
 }
 
 impl<I: IdLike<Widget = TextEdit>> TextEditable for I {
-    fn edit<'a>(&self, ui: &'a mut impl HasUi) -> TextEditCtx<'a> {
+    fn edit<'a>(&self, ui: &'a mut impl UiRsc) -> TextEditCtx<'a> {
         let ui = ui.ui_mut();
         TextEditCtx {
             text: ui.widgets.get_mut(self).unwrap(),

src/widget/trait_fns.rs

@@ -3,7 +3,7 @@ use crate::prelude::*;
 
 // these methods should "not require any context" (require unit) because they're in core
 widget_trait! {
-    pub trait CoreWidget<Rsc: HasUi + 'static>;
+    pub trait CoreWidget<Rsc: UiRsc + 'static>;
 
     fn pad(self, padding: impl Into<Padding>) -> impl WidgetFn<Rsc, Pad> {
         |state| Pad {
@@ -26,7 +26,7 @@ widget_trait! {
     fn label(self, label: impl Into<String>) -> impl WidgetIdFn<Rsc, WL::Widget> {
         |state| {
             let id = self.add(state);
-            state.ui_mut().set_label(id, label.into());
+            state.ui_mut().widgets.set_label(id, label.into());
             id
         }
     }
@@ -127,7 +127,7 @@ widget_trait! {
 
     fn set_ptr(self, ptr: WeakWidget<WidgetPtr>, state: &mut Rsc) {
         let id = self.add_strong(state);
-        state.ui_mut()[ptr].inner = Some(id);
+        state.ui_mut().widgets[ptr].inner = Some(id);
     }
 }