preparation

src/layout/widget.rs

@@ -1,4 +1,7 @@
-use crate::layout::{Painter, TextData, Textures, Ui, Vec2, WidgetId, WidgetIdFn, Widgets};
+use crate::layout::{
+    Cursor, Painter, StaticWidgetId, TextAttrs, TextBuffer, TextData, TextOffset, TextureHandle,
+    Textures, Ui, Vec2, WidgetId, WidgetIdFn, Widgets,
+};
 
 use std::{any::Any, marker::PhantomData};
 
@@ -20,6 +23,16 @@ impl SizeCtx<'_> {
     pub fn size<W>(&mut self, id: &WidgetId<W>) -> Vec2 {
         self.widgets.get_dyn_dynamic(&id.id).get_size(self)
     }
+    pub fn draw_text(
+        &mut self,
+        buffer: &mut TextBuffer,
+        content: &str,
+        attrs: &TextAttrs,
+        cursor: &Cursor,
+    ) -> (TextureHandle, TextOffset) {
+        self.text
+            .draw(buffer, content, attrs, cursor, self.textures)
+    }
 }
 
 pub struct WidgetTag;
@@ -31,7 +44,7 @@ pub trait WidgetLike<Tag> {
     fn with_id<W2>(
         self,
         f: impl FnOnce(&mut Ui, WidgetId<Self::Widget>) -> WidgetId<W2>,
-    ) -> WidgetIdFn!(W2)
+    ) -> impl WidgetIdFn<W2>
     where
         Self: Sized,
     {
@@ -40,20 +53,19 @@ pub trait WidgetLike<Tag> {
             f(ui, id)
         }
     }
+    fn add_static(self, ui: &mut Ui) -> StaticWidgetId<Self::Widget>
+    where
+        Self: Sized,
+    {
+        self.add(ui).into_static()
+    }
 }
 
-// pub trait WidgetFn<W: Widget<Ctx>, Ctx> = FnOnce(&mut Ui<Ctx>) -> W;
-
 /// 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
-/// currently a macro for rust analyzer (doesn't support trait aliases atm)
-macro_rules! WidgetFn {
-    ($W:ty) => {
-        impl FnOnce(&mut $crate::layout::Ui) -> $W
-    };
-}
-pub(crate) use WidgetFn;
+pub trait WidgetFn<W: Widget>: FnOnce(&mut Ui) -> W {}
+impl<W: Widget, F: FnOnce(&mut Ui) -> W> WidgetFn<W> for F {}
 
 impl<W: Widget, F: FnOnce(&mut Ui) -> W> WidgetLike<FnTag> for F {
     type Widget = W;