summaryrefslogtreecommitdiffstats
path: root/native/src/layout
diff options
context:
space:
mode:
Diffstat (limited to 'native/src/layout')
-rw-r--r--native/src/layout/limits.rs9
1 files changed, 7 insertions, 2 deletions
diff --git a/native/src/layout/limits.rs b/native/src/layout/limits.rs
index 33a452d0..0ddee91a 100644
--- a/native/src/layout/limits.rs
+++ b/native/src/layout/limits.rs
@@ -153,12 +153,17 @@ impl Limits {
/// Computes the resulting [`Size`] that fits the [`Limits`] given the
/// intrinsic size of some content.
+ #[allow(clippy::manual_clamp)]
pub fn resolve(&self, intrinsic_size: Size) -> Size {
Size::new(
- intrinsic_size.width.clamp(self.fill.width, self.max.width),
+ intrinsic_size
+ .width
+ .min(self.max.width)
+ .max(self.fill.width),
intrinsic_size
.height
- .clamp(self.fill.height, self.max.height),
+ .min(self.max.height)
+ .max(self.fill.height),
)
}
}