Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Change the default for the measure_func field of ContentSize to None. #9346

Merged
merged 6 commits into from
Aug 7, 2023
Merged

Change the default for the measure_func field of ContentSize to None. #9346

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
3fb1d8e
Changed the default value for `ContentSize`'s `measure_func` field to…
ickshonpe Aug 3, 2023
84d62ff
cargo fmt
ickshonpe Aug 3, 2023
46b9986
Derive default, no need for manual impl
ickshonpe Aug 3, 2023
e014614
cargo fmt
ickshonpe Aug 3, 2023
ba7d70e
`ContentSize`
ickshonpe Aug 7, 2023
d55474e
Merge branch 'main' into content-size-default-measure-func-none
ickshonpe Aug 7, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 8 additions & 9 deletions crates/bevy_ui/src/measurement.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
use bevy_ecs::prelude::Component;
use bevy_ecs::reflect::ReflectComponent;
use bevy_math::Vec2;
use bevy_reflect::Reflect;
use bevy_reflect::{std_traits::ReflectDefault, Reflect};
use std::fmt::Formatter;
pub use taffy::style::AvailableSpace;
use taffy::{node::MeasureFunc, prelude::Size as TaffySize};
Expand Down Expand Up @@ -46,8 +46,8 @@ impl Measure for FixedMeasure {

/// A node with a `ContentSize` component is a node where its size
/// is based on its content.
#[derive(Component, Reflect)]
#[reflect(Component)]
#[derive(Component, Reflect, Default)]
#[reflect(Component, Default)]
pub struct ContentSize {
/// The `Measure` used to compute the intrinsic size
#[reflect(ignore)]
Expand All @@ -66,12 +66,11 @@ impl ContentSize {
};
self.measure_func = Some(MeasureFunc::Boxed(Box::new(measure_func)));
}
}

impl Default for ContentSize {
fn default() -> Self {
Self {
measure_func: Some(MeasureFunc::Raw(|_, _| TaffySize::ZERO)),
}
/// Creates a `ContentSize` with a `Measure` that always returns given `size` argument, regardless of the UI layout's constraints.
pub fn fixed_size(size: Vec2) -> ContentSize {
let mut content_size = Self::default();
content_size.set(FixedMeasure { size });
content_size
}
}