leyoda/iced-yoda
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Make Shrink take priority over nested Fill

Browse source
This commit is contained in:
Héctor Ramón Jiménez 2025-08-21 02:26:10 +02:00
parent 199a189515
commit 7a7d562b03
No known key found for this signature in database
GPG key ID: 7CC46565708259A7
1 changed files with 31 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

41
core/src/layout/limits.rs
View file

@ -6,6 +6,7 @@ use crate::{Length, Size};
pub struct Limits { pub struct Limits {
min: Size, min: Size,
max: Size, max: Size,
compress: Size<bool>,
} }
impl Limits { impl Limits {
@ -13,11 +14,16 @@ impl Limits {
pub const NONE: Limits = Limits { pub const NONE: Limits = Limits {
min: Size::ZERO, min: Size::ZERO,
max: Size::INFINITE, max: Size::INFINITE,
compress: Size::new(false, false),
}; };
/// Creates new [`Limits`] with the given minimum and maximum [`Size`]. /// Creates new [`Limits`] with the given minimum and maximum [`Size`].
pub const fn new(min: Size, max: Size) -> Limits { pub const fn new(min: Size, max: Size) -> Limits {
Limits { min, max } Limits {
min,
max,
compress: Size::new(false, false),
}
} }
/// Returns the minimum [`Size`] of the [`Limits`]. /// Returns the minimum [`Size`] of the [`Limits`].
@ -33,13 +39,17 @@ impl Limits {
/// Applies a width constraint to the current [`Limits`]. /// Applies a width constraint to the current [`Limits`].
pub fn width(mut self, width: impl Into<Length>) -> Limits { pub fn width(mut self, width: impl Into<Length>) -> Limits {
match width.into() { match width.into() {
Length::Shrink | Length::Fill | Length::FillPortion(_) => {} Length::Shrink => {
self.compress.width = true;
}
Length::Fixed(amount) => { Length::Fixed(amount) => {
let new_width = amount.min(self.max.width).max(self.min.width); let new_width = amount.min(self.max.width).max(self.min.width);
self.min.width = new_width; self.min.width = new_width;
self.max.width = new_width; self.max.width = new_width;
self.compress.width = false;
} }
Length::Fill | Length::FillPortion(_) => {}
} }
self self
@ -48,14 +58,18 @@ impl Limits {
/// Applies a height constraint to the current [`Limits`]. /// Applies a height constraint to the current [`Limits`].
pub fn height(mut self, height: impl Into<Length>) -> Limits { pub fn height(mut self, height: impl Into<Length>) -> Limits {
match height.into() { match height.into() {
Length::Shrink | Length::Fill | Length::FillPortion(_) => {} Length::Shrink => {
self.compress.height = true;
}
Length::Fixed(amount) => { Length::Fixed(amount) => {
let new_height = let new_height =
amount.min(self.max.height).max(self.min.height); amount.min(self.max.height).max(self.min.height);
self.min.height = new_height; self.min.height = new_height;
self.max.height = new_height; self.max.height = new_height;
self.compress.height = false;
} }
Length::Fill | Length::FillPortion(_) => {}
} }
self self
@ -103,7 +117,11 @@ impl Limits {
(self.max().height - size.height).max(0.0), (self.max().height - size.height).max(0.0),
); );
Limits { min, max } Limits {
min,
max,
compress: self.compress,
}
} }
/// Removes the minimum width constraint for the current [`Limits`]. /// Removes the minimum width constraint for the current [`Limits`].
@ -111,6 +129,7 @@ impl Limits {
Limits { Limits {
min: Size::ZERO, min: Size::ZERO,
max: self.max, max: self.max,
compress: self.compress,
} }
} }
@ -124,21 +143,23 @@ impl Limits {
intrinsic_size: Size, intrinsic_size: Size,
) -> Size { ) -> Size {
let width = match width.into() { let width = match width.into() {
Length::Fill | Length::FillPortion(_) => self.max.width, Length::Fill | Length::FillPortion(_) if !self.compress.width => {
self.max.width
}
Length::Fixed(amount) => { Length::Fixed(amount) => {
amount.min(self.max.width).max(self.min.width) amount.min(self.max.width).max(self.min.width)
} }
Length::Shrink => { _ => intrinsic_size.width.min(self.max.width).max(self.min.width),
intrinsic_size.width.min(self.max.width).max(self.min.width)
}
}; };
let height = match height.into() { let height = match height.into() {
Length::Fill | Length::FillPortion(_) => self.max.height, Length::Fill | Length::FillPortion(_) if !self.compress.height => {
self.max.height
}
Length::Fixed(amount) => { Length::Fixed(amount) => {
amount.min(self.max.height).max(self.min.height) amount.min(self.max.height).max(self.min.height)
} }
Length::Shrink => intrinsic_size _ => intrinsic_size
.height .height
.min(self.max.height) .min(self.max.height)
.max(self.min.height), .max(self.min.height),