From f75ab0bd662c73d15057d746347d09bf94a992a6 Mon Sep 17 00:00:00 2001 From: crupest Date: Wed, 16 Feb 2022 22:42:34 +0800 Subject: ... --- src/ui/render/TextRenderObject.cpp | 3 +++ 1 file changed, 3 insertions(+) (limited to 'src/ui/render/TextRenderObject.cpp') diff --git a/src/ui/render/TextRenderObject.cpp b/src/ui/render/TextRenderObject.cpp index a64c96d2..82f314bd 100644 --- a/src/ui/render/TextRenderObject.cpp +++ b/src/ui/render/TextRenderObject.cpp @@ -216,10 +216,13 @@ Size TextRenderObject::OnMeasureContent(const MeasureRequirement& requirement, result.width = std::max(result.width, preferred_size.width.GetLengthOr0()); result.width = std::max(result.width, requirement.min.width.GetLengthOr0()); + result.width = std::min(result.width, requirement.max.width.GetLengthOrMax()); result.height = std::max(result.height, preferred_size.height.GetLengthOr0()); result.height = std::max(result.height, requirement.min.height.GetLengthOr0()); + result.height = + std::min(result.height, requirement.max.height.GetLengthOrMax()); return result; } -- cgit v1.2.3