forestia/bevy
2
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Move ContentSize requirements from Node to the widget defining components (#16083)

Browse Source 
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.

Remove `ContentSize` from `Node`'s required components and add it to the
required components of `Text` and `UiImage`.

---------

Co-authored-by: Alice Cecile <alice.i.cecile@gmail.com>
This commit is contained in:
ickshonpe 2024-10-27 22:39:32 +00:00 committed by François
parent 013a18b648
commit dfd3d61aae
No known key found for this signature in database
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
crates/bevy_ui/src/ui_node.rs
View File

@ -1,4 +1,4 @@
use crate::{widget::UiImageSize, ContentSize, FocusPolicy, UiRect, Val}; use crate::{widget::UiImageSize, FocusPolicy, UiRect, Val};
use bevy_asset::Handle; use bevy_asset::Handle;
use bevy_color::Color; use bevy_color::Color;
use bevy_ecs::{prelude::*, system::SystemParam}; use bevy_ecs::{prelude::*, system::SystemParam};
@ -288,7 +288,6 @@ impl From<&Vec2> for ScrollPosition {
BackgroundColor, BackgroundColor,
BorderColor, BorderColor,
BorderRadius, BorderRadius,
ContentSize,
FocusPolicy, FocusPolicy,
ScrollPosition, ScrollPosition,
Transform, Transform,

2
crates/bevy_ui/src/widget/text.rs
View File

@ -102,7 +102,7 @@ pub struct TextBundle {}
/// ``` /// ```
#[derive(Component, Debug, Default, Clone, Deref, DerefMut, Reflect)] #[derive(Component, Debug, Default, Clone, Deref, DerefMut, Reflect)]
#[reflect(Component, Default, Debug)] #[reflect(Component, Default, Debug)]
#[require(Node, TextLayout, TextFont, TextColor, TextNodeFlags)] #[require(Node, TextLayout, TextFont, TextColor, TextNodeFlags, ContentSize)]
pub struct Text(pub String); pub struct Text(pub String);
impl Text { impl Text {