From 2ed4de053b8dc1e120f52ec65b384550763c1acd Mon Sep 17 00:00:00 2001 From: griffi-gh <prasol258@gmail.com> Date: Mon, 31 Mar 2025 13:49:52 +0200 Subject: [PATCH] fix: frame position calc with padding --- hui/src/element/builtin/container.rs | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/hui/src/element/builtin/container.rs b/hui/src/element/builtin/container.rs index c35785e..b4a613c 100644 --- a/hui/src/element/builtin/container.rs +++ b/hui/src/element/builtin/container.rs @@ -324,10 +324,7 @@ impl UiElement for Container { //After setting the inner_content_size, we can calculate the size of the container //Including padding, and in case the size is set to non-auto, override the size - total_size += vec2( - padding_with_margin.sum_horizontal(), - padding_with_margin.sum_vertical(), - ); + total_size += padding_with_margin.sum_vec(); let computed_size = compute_size(ctx.layout, self.size, total_size); match self.size.width { @@ -385,7 +382,7 @@ impl UiElement for Container { // } let frame_position = ctx.layout.position + self.margin.top_left(); - let frame_size = ctx.measure.size - vec2(padding_with_margin.sum_horizontal(), padding_with_margin.sum_vertical()); + let frame_size = ctx.measure.size - self.margin.sum_vec(); self.background_frame.draw(ctx.paint_target, (frame_position, frame_size).into()); //padding