add scroll fn to traits

src/core/mod.rs

@@ -3,7 +3,6 @@ mod image;
 mod offset;
 mod pad;
 mod rect;
-mod scroll;
 mod sense;
 mod sized;
 mod span;
@@ -17,7 +16,6 @@ pub use image::*;
 pub use offset::*;
 pub use pad::*;
 pub use rect::*;
-pub use scroll::*;
 pub use sense::*;
 pub use sized::*;
 pub use span::*;

src/core/scroll.rs

@@ -1,19 +0,0 @@
-use crate::prelude::*;
-
-pub struct Scroll {
-    pub inner: Offset,
-    pub size: UiVec2,
-}
-
-impl Widget for Scroll {
-    fn draw(&mut self, painter: &mut Painter) {
-        self.inner.draw(painter);
-    }
-    fn desired_size(&mut self, _: &mut SizeCtx) -> UiVec2 {
-        self.size
-    }
-}
-
-pub struct ScrollModule {
-
-}

src/core/trait_fns.rs

@@ -8,6 +8,7 @@ pub trait CoreWidget<W, Tag> {
     fn label(self, label: impl Into<String>) -> impl WidgetIdFn<W>;
     fn sized(self, size: impl Into<Vec2>) -> impl WidgetFn<Sized>;
     fn offset(self, amt: impl Into<UiVec2>) -> impl WidgetFn<Offset>;
+    fn scroll(self) -> impl WidgetIdFn<Offset>;
 }
 
 impl<W: WidgetLike<Tag>, Tag> CoreWidget<W::Widget, Tag> for W {
@@ -50,6 +51,12 @@ impl<W: WidgetLike<Tag>, Tag> CoreWidget<W::Widget, Tag> for W {
             amt: amt.into(),
         }
     }
+
+    fn scroll(self) -> impl WidgetIdFn<Offset> {
+        self.offset(UiVec2::ZERO).edit_on(Sense::Scroll, |w, data| {
+            w.amt += UiVec2::abs(data.scroll_delta * 50.0);
+        })
+    }
 }
 
 pub trait CoreWidgetArr<const LEN: usize, Wa: WidgetArrLike<LEN, Tag>, Tag> {

src/testing/mod.rs

@@ -129,15 +129,7 @@ impl Client {
             .add_static(&mut ui);
 
         let texts = Span::empty(Dir::DOWN).add_static(&mut ui);
-        let msg_area = (
-            Rect::new(Color::SKY),
-            texts
-                .offset(UiVec2::ZERO)
-                .edit_on(Sense::Scroll, |w, data| {
-                    w.amt += UiVec2::abs(data.scroll_delta * 50.0);
-                }),
-        )
-            .stack();
+        let msg_area = (Rect::new(Color::SKY), texts.scroll()).stack();
         let add_text = text_edit("add")
             .text_align(Align::Left)
             .size(30)