diff --git a/src/core/span.rs b/src/core/span.rs index 7298022..827ab20 100644 --- a/src/core/span.rs +++ b/src/core/span.rs @@ -51,7 +51,7 @@ impl Widget for Span { let dir_len = if total.ratio != 0.0 { ctx.size.axis(axis) } else { - total.fixed + total.relative * ctx.screen_size.axis(axis) + total.fixed + total.relative * ctx.size.axis(axis) }; Vec2::from_axis(axis, dir_len, total.max_sized) } diff --git a/src/layout/painter.rs b/src/layout/painter.rs index 8e15df8..52b2399 100644 --- a/src/layout/painter.rs +++ b/src/layout/painter.rs @@ -158,7 +158,6 @@ impl<'a> Painter<'a> { pub fn size_ctx(&mut self) -> SizeCtx { SizeCtx { - screen_size: self.screen_size, size: self.region().in_size(self.screen_size), text: self.text, textures: self.textures, diff --git a/src/layout/widget.rs b/src/layout/widget.rs index 5259483..dae2963 100644 --- a/src/layout/widget.rs +++ b/src/layout/widget.rs @@ -10,7 +10,6 @@ pub trait Widget: Any { } pub struct SizeCtx<'a> { - pub screen_size: Vec2, pub size: Vec2, pub text: &'a mut TextData, pub textures: &'a mut Textures,