From e63d7c340fa9d335877299b934c899838d43b7a5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Mockers?= Date: Wed, 28 Aug 2024 00:41:23 +0200 Subject: [PATCH] don't use padding for layout (#14944) # Objective - Fixes #14792 - Padding is already handled by taffy, don't handle it also on Bevy side ## Solution - Remove extra computation added in https://github.com/bevyengine/bevy/pull/14777 --- crates/bevy_ui/src/layout/mod.rs | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/crates/bevy_ui/src/layout/mod.rs b/crates/bevy_ui/src/layout/mod.rs index 803221af3a..f74ef60131 100644 --- a/crates/bevy_ui/src/layout/mod.rs +++ b/crates/bevy_ui/src/layout/mod.rs @@ -264,16 +264,10 @@ pub fn ui_layout_system( let Ok(layout) = ui_surface.get_layout(entity) else { return; }; - let layout_size = inverse_target_scale_factor - * Vec2::new( - layout.size.width - layout.padding.left - layout.padding.right, - layout.size.height - layout.padding.top - layout.padding.bottom, - ); - let layout_location = inverse_target_scale_factor - * Vec2::new( - layout.location.x + layout.padding.left, - layout.location.y + layout.padding.top, - ); + let layout_size = + inverse_target_scale_factor * Vec2::new(layout.size.width, layout.size.height); + let layout_location = + inverse_target_scale_factor * Vec2::new(layout.location.x, layout.location.y); absolute_location += layout_location;