Move aspect ratios with size constraints

Author: alice-i-cecile

crates/bevy_ui/src/flex/convert.rs

@@ -59,7 +59,7 @@ pub fn from_flexbox_layout(
         size: from_val_size(scale_factor, value.size_constraints.suggested),
         min_size: from_val_size(scale_factor, value.size_constraints.min),
         max_size: from_val_size(scale_factor, value.size_constraints.max),
-        aspect_ratio: match value.flexbox_layout.aspect_ratio {
+        aspect_ratio: match value.size_constraints.aspect_ratio {
             Some(value) => taffy::number::Number::Defined(value),
             None => taffy::number::Number::Undefined,
         },

crates/bevy_ui/src/layout_components.rs

@@ -1,5 +1,3 @@
-#![warn(missing_docs)]
-
 //! Components used to control the layout of [`UiNode`] entities.
 use crate::{Size, UiRect, Val};
 use bevy_derive::{Deref, DerefMut};
@@ -71,6 +69,8 @@ pub struct SizeConstraints {
     pub suggested: Size<Val>,
     /// The maximum extent, which cannot be violated by the layouting algorithm
     pub max: Size<Val>,
+    /// The expected aspect ratio, computed as width / height
+    pub aspect_ratio: Option<f32>,
 }
 
 /// The space around and inside of a UI node
@@ -205,8 +205,6 @@ pub mod flex {
         pub shrink: f32,
         /// The initial size of the item
         pub basis: Val,
-        /// The aspect ratio of the flexbox
-        pub aspect_ratio: Option<f32>,
     }
 
     impl Default for FlexboxLayout {
@@ -220,7 +218,6 @@ pub mod flex {
                 grow: 0.0,
                 shrink: 1.0,
                 basis: Val::Auto,
-                aspect_ratio: Default::default(),
             }
         }
     }