rename a bit

src/layout/painter.rs

@@ -153,7 +153,7 @@ impl<'a> Painter<'a> {
     pub fn size<W>(&mut self, id: &WidgetId<W>) -> Vec2 {
         self.widgets
             .get_dyn_dynamic(&id.id)
-            .size(&mut self.size_ctx())
+            .get_size(&mut self.size_ctx())
     }
 
     pub fn size_ctx(&mut self) -> SizeCtx<'_> {

src/layout/text.rs

@@ -23,7 +23,7 @@ impl Default for TextData {
 #[derive(Clone, Copy)]
 pub struct TextAttrs {
     pub color: UiColor,
-    pub size: f32,
+    pub font_size: f32,
     pub line_height: f32,
     pub family: Family<'static>,
 }
@@ -35,7 +35,7 @@ impl Default for TextAttrs {
         let size = 14.0;
         Self {
             color: UiColor::WHITE,
-            size,
+            font_size: size,
             line_height: size * 1.2,
             family: Family::SansSerif,
         }
@@ -52,7 +52,7 @@ impl TextData {
     ) -> (TextureHandle, TextOffset) {
         buffer.set_metrics(
             &mut self.font_system,
-            Metrics::new(attrs.size, attrs.line_height),
+            Metrics::new(attrs.font_size, attrs.line_height),
         );
         buffer.set_text(
             &mut self.font_system,

src/layout/widget.rs

@@ -4,7 +4,7 @@ use std::{any::Any, marker::PhantomData};
 
 pub trait Widget: Any {
     fn draw(&mut self, painter: &mut Painter);
-    fn size(&mut self, ctx: &mut SizeCtx) -> Vec2 {
+    fn get_size(&mut self, ctx: &mut SizeCtx) -> Vec2 {
         ctx.size
     }
 }
@@ -18,7 +18,7 @@ pub struct SizeCtx<'a> {
 
 impl SizeCtx<'_> {
     pub fn size<W>(&mut self, id: &WidgetId<W>) -> Vec2 {
-        self.widgets.get_dyn_dynamic(&id.id).size(self)
+        self.widgets.get_dyn_dynamic(&id.id).get_size(self)
     }
 }