finished moving out render_state

core/src/ui/painter.rs

@@ -1,14 +1,14 @@
 use crate::{
     Axis, Len, RenderedText, Size, SizeCtx, StrongWidget, TextAttrs, TextBuffer, TextData,
-    TextureHandle, UiRegion, Widget, WidgetId,
+    TextureHandle, UiRegion, UiRenderState, UiRsc, Widget, WidgetId,
     render::{Mask, MaskIdx, Primitive, PrimitiveHandle, PrimitiveInst},
-    ui::draw_state::Drawer,
     util::Vec2,
 };
 
 /// makes your surfaces look pretty
-pub struct Painter<'a, 'b> {
-    pub(super) drawer: &'a mut Drawer<'b>,
+pub struct Painter<'a> {
+    pub(super) state: &'a mut UiRenderState,
+    pub(super) rsc: &'a mut dyn UiRsc,
 
     pub(super) region: UiRegion,
     pub(super) mask: MaskIdx,
@@ -19,9 +19,9 @@ pub struct Painter<'a, 'b> {
     pub(super) id: WidgetId,
 }
 
-impl<'a, 'c> Painter<'a, 'c> {
+impl<'a> Painter<'a> {
     fn primitive_at<P: Primitive>(&mut self, primitive: P, region: UiRegion) {
-        let h = self.drawer.layers.write(
+        let h = self.state.layers.write(
             self.layer,
             PrimitiveInst {
                 id: self.id,
@@ -32,7 +32,7 @@ impl<'a, 'c> Painter<'a, 'c> {
         );
         if self.mask != MaskIdx::NONE {
             // TODO: I have no clue if this works at all :joy:
-            self.drawer.masks.push_ref(self.mask);
+            self.rsc.ui_mut().masks.push_ref(self.mask);
         }
         self.primitives.push(h);
     }
@@ -48,7 +48,7 @@ impl<'a, 'c> Painter<'a, 'c> {
 
     pub fn set_mask(&mut self, region: UiRegion) {
         assert!(self.mask == MaskIdx::NONE);
-        self.mask = self.drawer.masks.push(Mask { region });
+        self.mask = self.rsc.ui_mut().masks.push(Mask { region });
     }
 
     /// Draws a widget within this widget's region.
@@ -64,8 +64,15 @@ impl<'a, 'c> Painter<'a, 'c> {
 
     fn widget_at<W: ?Sized>(&mut self, id: &StrongWidget<W>, region: UiRegion) {
         self.children.push(id.id());
-        self.drawer
-            .draw_inner(self.layer, id.id(), region, Some(self.id), self.mask, None);
+        self.state.draw_inner(
+            self.layer,
+            id.id(),
+            region,
+            Some(self.id),
+            self.mask,
+            None,
+            self.rsc,
+        );
     }
 
     pub fn texture_within(&mut self, handle: &TextureHandle, region: UiRegion) {
@@ -85,10 +92,8 @@ impl<'a, 'c> Painter<'a, 'c> {
 
     /// returns (handle, offset from top left)
     pub fn render_text(&mut self, buffer: &mut TextBuffer, attrs: &TextAttrs) -> RenderedText {
-        self.drawer
-            .ui
-            .text
-            .draw(buffer, attrs, &mut self.drawer.ui.textures)
+        let ui = self.rsc.ui_mut();
+        ui.text.draw(buffer, attrs, &mut ui.textures)
     }
 
     pub fn region(&self) -> UiRegion {
@@ -107,27 +112,27 @@ impl<'a, 'c> Painter<'a, 'c> {
     }
 
     pub fn output_size(&self) -> Vec2 {
-        self.drawer.output_size
+        self.state.output_size
     }
 
     pub fn px_size(&mut self) -> Vec2 {
-        self.region.size().to_abs(self.drawer.output_size)
+        self.region.size().to_abs(self.state.output_size)
     }
 
     pub fn text_data(&mut self) -> &mut TextData {
-        &mut self.drawer.text
+        &mut self.rsc.ui_mut().text
     }
 
     pub fn child_layer(&mut self) {
-        self.layer = self.drawer.layers.child(self.layer);
+        self.layer = self.state.layers.child(self.layer);
     }
 
     pub fn next_layer(&mut self) {
-        self.layer = self.drawer.layers.next(self.layer);
+        self.layer = self.state.layers.next(self.layer);
     }
 
     pub fn label(&self) -> &str {
-        &self.drawer.widgets.data(self.id).unwrap().label
+        &self.rsc.widgets().data(self.id).unwrap().label
     }
 
     pub fn id(&self) -> &WidgetId {
@@ -135,6 +140,6 @@ impl<'a, 'c> Painter<'a, 'c> {
     }
 
     pub fn size_ctx(&mut self) -> SizeCtx<'_> {
-        self.drawer.size_ctx(self.id, self.region.size())
+        self.state.size_ctx(self.id, self.region.size(), self.rsc)
     }
 }