oopsie (orderlerss -> ordered rendering)

src/core/position/layer.rs

@@ -0,0 +1,23 @@
+use crate::prelude::*;
+
+pub struct LayerOffset {
+    pub inner: WidgetId,
+    pub offset: usize,
+}
+
+impl Widget for LayerOffset {
+    fn draw(&mut self, painter: &mut Painter) {
+        for _ in 0..self.offset {
+            painter.next_layer();
+        }
+        painter.widget(&self.inner);
+    }
+
+    fn desired_width(&mut self, ctx: &mut SizeCtx) -> Len {
+        ctx.width(&self.inner)
+    }
+
+    fn desired_height(&mut self, ctx: &mut SizeCtx) -> Len {
+        ctx.height(&self.inner)
+    }
+}

src/core/position/mod.rs

@@ -1,4 +1,5 @@
 mod align;
+mod layer;
 mod max_size;
 mod offset;
 mod pad;
@@ -8,6 +9,7 @@ mod span;
 mod stack;
 
 pub use align::*;
+pub use layer::*;
 pub use max_size::*;
 pub use offset::*;
 pub use pad::*;

src/core/position/stack.rs

@@ -5,14 +5,10 @@ use crate::prelude::*;
 pub struct Stack {
     pub children: Vec<WidgetId>,
     pub size: StackSize,
-    pub offset: usize,
 }
 
 impl Widget for Stack {
     fn draw(&mut self, painter: &mut Painter) {
-        for _ in 0..self.offset {
-            painter.next_layer();
-        }
         let mut iter = self.children.iter();
         if let Some(child) = iter.next() {
             painter.child_layer();
@@ -49,7 +45,6 @@ pub enum StackSize {
 pub struct StackBuilder<const LEN: usize, Wa: WidgetArrLike<LEN, Tag>, Tag> {
     pub children: Wa,
     pub size: StackSize,
-    pub offset: usize,
     _pd: PhantomData<Tag>,
 }
 
@@ -61,7 +56,6 @@ impl<const LEN: usize, Wa: WidgetArrLike<LEN, Tag>, Tag> FnOnce<(&mut Ui,)>
     extern "rust-call" fn call_once(self, args: (&mut Ui,)) -> Self::Output {
         Stack {
             children: self.children.ui(args.0).arr.to_vec(),
-            offset: self.offset,
             size: self.size,
         }
     }
@@ -72,7 +66,6 @@ impl<const LEN: usize, Wa: WidgetArrLike<LEN, Tag>, Tag> StackBuilder<LEN, Wa, T
         Self {
             children,
             size: StackSize::default(),
-            offset: 0,
             _pd: PhantomData,
         }
     }
@@ -81,9 +74,4 @@ impl<const LEN: usize, Wa: WidgetArrLike<LEN, Tag>, Tag> StackBuilder<LEN, Wa, T
         self.size = size;
         self
     }
-
-    pub fn offset_layer(mut self, offset: usize) -> Self {
-        self.offset = offset;
-        self
-    }
 }

src/core/text/mod.rs

@@ -91,8 +91,9 @@ impl TextView {
             && line.text().is_empty()
         {
             painter.widget(hint);
+        } else {
+            painter.texture_within(&tex.handle, region);
         }
-        painter.texture_within(&tex.handle, region);
         region
     }
 

src/core/trait_fns.rs

@@ -15,7 +15,7 @@ pub trait CoreWidget<W, Tag> {
     fn scroll(self) -> impl WidgetIdFn<Scroll>;
     fn masked(self) -> impl WidgetFn<Masked>;
     fn background<T>(self, w: impl WidgetLike<T>) -> impl WidgetFn<Stack>;
-    fn layer_offset(self, offset: usize) -> impl WidgetFn<Stack>;
+    fn layer_offset(self, offset: usize) -> impl WidgetFn<LayerOffset>;
 }
 
 impl<W: WidgetLike<Tag>, Tag> CoreWidget<W::Widget, Tag> for W {
@@ -117,14 +117,12 @@ impl<W: WidgetLike<Tag>, Tag> CoreWidget<W::Widget, Tag> for W {
         move |ui| Stack {
             children: vec![w.add(ui).any(), self.add(ui).any()],
             size: StackSize::Child(1),
-            offset: 0,
         }
     }
 
-    fn layer_offset(self, offset: usize) -> impl WidgetFn<Stack> {
-        move |ui| Stack {
-            children: vec![self.add(ui).any()],
-            size: StackSize::Child(0),
+    fn layer_offset(self, offset: usize) -> impl WidgetFn<LayerOffset> {
+        move |ui| LayerOffset {
+            inner: self.add(ui).any(),
             offset,
         }
     }