aboutsummaryrefslogtreecommitdiff
path: root/src/ui/render/TextRenderObject.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/ui/render/TextRenderObject.cpp')
-rw-r--r--src/ui/render/TextRenderObject.cpp3
1 files changed, 3 insertions, 0 deletions
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;
}