From 78a4bea3d7ac23d1a03ddd07472614a81439c5f7 Mon Sep 17 00:00:00 2001 From: ickshonpe Date: Sun, 27 Oct 2024 22:39:32 +0000 Subject: [PATCH] Move `ContentSize` requirements from `Node` to the widget defining components (#16083) # Objective Missed this in the required components PR review. `ContentSize` isn't used by regular UI nodes, only those with intrinsically sized content that needs a measure func. ## Solution Remove `ContentSize` from `Node`'s required components and add it to the required components of `Text` and `UiImage`. --------- Co-authored-by: Alice Cecile --- crates/bevy_ui/src/ui_node.rs | 3 +-- crates/bevy_ui/src/widget/text.rs | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/crates/bevy_ui/src/ui_node.rs b/crates/bevy_ui/src/ui_node.rs index 20631927e1..92092fe5f5 100644 --- a/crates/bevy_ui/src/ui_node.rs +++ b/crates/bevy_ui/src/ui_node.rs @@ -1,4 +1,4 @@ -use crate::{ContentSize, FocusPolicy, UiRect, Val}; +use crate::{FocusPolicy, UiRect, Val}; use bevy_color::Color; use bevy_ecs::{prelude::*, system::SystemParam}; use bevy_math::{vec4, Rect, Vec2, Vec4Swizzles}; @@ -286,7 +286,6 @@ impl From<&Vec2> for ScrollPosition { BackgroundColor, BorderColor, BorderRadius, - ContentSize, FocusPolicy, ScrollPosition, Transform, diff --git a/crates/bevy_ui/src/widget/text.rs b/crates/bevy_ui/src/widget/text.rs index 90222ef5cd..30817e05da 100644 --- a/crates/bevy_ui/src/widget/text.rs +++ b/crates/bevy_ui/src/widget/text.rs @@ -102,7 +102,7 @@ pub struct TextBundle {} /// ``` #[derive(Component, Debug, Default, Clone, Deref, DerefMut, Reflect)] #[reflect(Component, Default, Debug)] -#[require(Node, TextLayout, TextFont, TextColor, TextNodeFlags)] +#[require(Node, TextLayout, TextFont, TextColor, TextNodeFlags, ContentSize)] pub struct Text(pub String); impl Text {