Use layout = self.#text_field

kas-gui · Jan 21, 2025 · 02d5598 · 02d5598
1 parent a2a48d4
commit 02d5598
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 36 deletions.
diff --git a/crates/kas-core/src/decorations.rs b/crates/kas-core/src/decorations.rs
@@ -103,6 +103,7 @@ impl_scope! {
     #[derive(Clone, Debug, Default)]
     #[widget {
         Data = ();
+        layout = self.text;
     }]
     pub(crate) struct Label {
         core: widget_core!(),
@@ -121,18 +122,10 @@ impl_scope! {
     }
 
     impl Layout for Self {
-        fn size_rules(&mut self, sizer: SizeCx, axis: AxisInfo) -> SizeRules {
-            sizer.text_rules(&mut self.text, axis)
-        }
-
         fn set_rect(&mut self, cx: &mut ConfigCx, rect: Rect, hints: AlignHints) {
             self.core.rect = rect;
             self.text.set_rect(cx, rect, hints.combine(AlignHints::CENTER));
         }
-
-        fn draw(&mut self, mut draw: DrawCx) {
-            draw.text(self.rect(), &self.text);
-        }
     }
 
     impl Events for Self {

diff --git a/crates/kas-core/src/hidden.rs b/crates/kas-core/src/hidden.rs
@@ -26,6 +26,7 @@ impl_scope! {
     #[derive(Clone, Debug, Default)]
     #[widget {
         Data = ();
+        layout = self.text;
     }]
     pub struct StrLabel {
         core: widget_core!(),
@@ -44,19 +45,10 @@ impl_scope! {
     }
 
     impl Layout for Self {
-        #[inline]
-        fn size_rules(&mut self, sizer: SizeCx, axis: AxisInfo) -> SizeRules {
-            sizer.text_rules(&mut self.text, axis)
-        }
-
         fn set_rect(&mut self, cx: &mut ConfigCx, rect: Rect, hints: AlignHints) {
             self.core.rect = rect;
             self.text.set_rect(cx, rect, hints.combine(AlignHints::VERT_CENTER));
         }
-
-        fn draw(&mut self, mut draw: DrawCx) {
-            draw.text(self.rect(), &self.text);
-        }
     }
 
     impl Events for Self {

diff --git a/crates/kas-widgets/src/label.rs b/crates/kas-widgets/src/label.rs
@@ -26,6 +26,7 @@ impl_scope! {
     #[derive(Clone, Debug)]
     #[widget {
         Data = ();
+        layout = self.text;
     }]
     pub struct Label<T: FormattableText + 'static> {
         core: widget_core!(),
@@ -111,19 +112,10 @@ impl_scope! {
     }
 
     impl Layout for Self {
-        #[inline]
-        fn size_rules(&mut self, sizer: SizeCx, axis: AxisInfo) -> SizeRules {
-            sizer.text_rules(&mut self.text, axis)
-        }
-
         fn set_rect(&mut self, cx: &mut ConfigCx, rect: Rect, hints: AlignHints) {
             self.core.rect = rect;
             self.text.set_rect(cx, rect, hints.combine(AlignHints::VERT_CENTER));
         }
-
-        fn draw(&mut self, mut draw: DrawCx) {
-            draw.text(self.rect(), &self.text);
-        }
     }
 
     impl Events for Self {
@@ -185,7 +177,9 @@ impl_scope! {
     /// Line-wrapping is enabled by default.
     #[impl_default]
     #[derive(Clone, Debug)]
-    #[widget]
+    #[widget {
+        layout = self.text;
+    }]
     pub struct AccessLabel {
         core: widget_core!(),
         text: Text<AccessString>,
@@ -264,19 +258,10 @@ impl_scope! {
     }
 
     impl Layout for Self {
-        #[inline]
-        fn size_rules(&mut self, sizer: SizeCx, axis: AxisInfo) -> SizeRules {
-            sizer.text_rules(&mut self.text, axis)
-        }
-
         fn set_rect(&mut self, cx: &mut ConfigCx, rect: Rect, hints: AlignHints) {
             self.core.rect = rect;
             self.text.set_rect(cx, rect, hints.combine(AlignHints::VERT_CENTER));
         }
-
-        fn draw(&mut self, mut draw: DrawCx) {
-            draw.text(self.rect(), &self.text);
-        }
     }
 
     impl Events for Self {