rename a bit

This commit is contained in:
2025-08-28 22:21:43 -04:00
parent 97f2f67dee
commit 3df76d926c
10 changed files with 34 additions and 31 deletions

View File

@@ -11,7 +11,7 @@ impl Widget for Aligned {
painter.draw_within(&self.inner, region);
}
fn size(&mut self, ctx: &mut SizeCtx) -> Vec2 {
fn get_size(&mut self, ctx: &mut SizeCtx) -> Vec2 {
ctx.size(&self.inner)
}
}

View File

@@ -10,7 +10,7 @@ impl Widget for Image {
painter.draw_texture(&self.handle);
}
fn size(&mut self, _: &mut SizeCtx) -> Vec2 {
fn get_size(&mut self, _: &mut SizeCtx) -> Vec2 {
self.handle.size()
}
}

View File

@@ -10,7 +10,7 @@ impl Widget for Sized {
painter.draw(&self.inner);
}
fn size(&mut self, _: &mut SizeCtx) -> Vec2 {
fn get_size(&mut self, _: &mut SizeCtx) -> Vec2 {
self.size
}
}

View File

@@ -43,7 +43,7 @@ impl Widget for Span {
}
}
fn size(&mut self, ctx: &mut SizeCtx) -> Vec2 {
fn get_size(&mut self, ctx: &mut SizeCtx) -> Vec2 {
let total = self.setup(ctx);
let axis = self.dir.axis;
let dir_len = if total.ratio != 0.0 {

View File

@@ -9,9 +9,9 @@ pub struct Text {
}
impl Text {
pub fn size(mut self, size: impl UiNum) -> Self {
self.attrs.size = size.to_f32();
self.attrs.line_height = self.attrs.size * 1.1;
pub fn font_size(mut self, size: impl UiNum) -> Self {
self.attrs.font_size = size.to_f32();
self.attrs.line_height = self.attrs.font_size * 1.1;
self
}
pub fn color(mut self, color: UiColor) -> Self {
@@ -41,7 +41,7 @@ impl Widget for Text {
// reuse TextureHandle
}
fn size(&mut self, ctx: &mut SizeCtx) -> Vec2 {
fn get_size(&mut self, ctx: &mut SizeCtx) -> Vec2 {
let (handle, offset) =
ctx.text
.draw(&mut self.buf, &self.content, &self.attrs, ctx.textures);
@@ -53,7 +53,7 @@ pub fn text(text: impl Into<String>) -> Text {
let attrs = TextAttrs::default();
Text {
content: text.into(),
buf: TextBuffer::new_empty(Metrics::new(attrs.size, attrs.line_height)),
buf: TextBuffer::new_empty(Metrics::new(attrs.font_size, attrs.line_height)),
attrs,
}
}

View File

@@ -7,7 +7,7 @@ pub trait CoreWidget<W, Tag> {
fn center(self) -> WidgetFnRet!(Aligned);
fn region(self, region: UiRegion) -> WidgetFnRet!(Regioned);
fn label(self, label: impl Into<String>) -> WidgetIdFnRet!(W);
fn sized(self, size: impl Into<Vec2>) -> WidgetFnRet!(Sized);
fn size(self, size: impl Into<Vec2>) -> WidgetFnRet!(Sized);
}
impl<W: WidgetLike<Tag>, Tag> CoreWidget<W::Widget, Tag> for W {
@@ -44,7 +44,7 @@ impl<W: WidgetLike<Tag>, Tag> CoreWidget<W::Widget, Tag> for W {
}
}
fn sized(self, size: impl Into<Vec2>) -> WidgetFnRet!(Sized) {
fn size(self, size: impl Into<Vec2>) -> WidgetFnRet!(Sized) {
move |ui| Sized {
inner: self.add(ui).erase_type(),
size: size.into(),