diff options
| author | crupest <crupest@outlook.com> | 2022-02-16 22:42:34 +0800 |
|---|---|---|
| committer | crupest <crupest@outlook.com> | 2022-02-16 22:42:34 +0800 |
| commit | f75ab0bd662c73d15057d746347d09bf94a992a6 (patch) | |
| tree | 91efc33de481edf5304001d80b914b69cc0fb338 /src/ui/render/TextRenderObject.cpp | |
| parent | 2711b7032cafdc9bdbd6ae06db0325c91e6e7f63 (diff) | |
| download | cru-f75ab0bd662c73d15057d746347d09bf94a992a6.tar.gz cru-f75ab0bd662c73d15057d746347d09bf94a992a6.tar.bz2 cru-f75ab0bd662c73d15057d746347d09bf94a992a6.zip | |
...
Diffstat (limited to 'src/ui/render/TextRenderObject.cpp')
| -rw-r--r-- | src/ui/render/TextRenderObject.cpp | 3 |
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; } |