From 4f0a2f32c273780c32cc3937615c2a8bbd993aab Mon Sep 17 00:00:00 2001 From: crupest Date: Mon, 22 Jun 2020 01:09:24 +0800 Subject: ... --- src/ui/render/WindowRenderObject.cpp | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'src/ui/render/WindowRenderObject.cpp') diff --git a/src/ui/render/WindowRenderObject.cpp b/src/ui/render/WindowRenderObject.cpp index cd1f806f..28afe01d 100644 --- a/src/ui/render/WindowRenderObject.cpp +++ b/src/ui/render/WindowRenderObject.cpp @@ -34,9 +34,14 @@ RenderObject* WindowRenderObject::HitTest(const Point& point) { return Rect{Point{}, GetSize()}.IsPointInside(point) ? this : nullptr; } -Size WindowRenderObject::OnMeasureContent(const Size& available_size) { - if (const auto child = GetChild()) child->Measure(available_size); - return available_size; +Size WindowRenderObject::OnMeasureContent( + const MeasureRequirement& requirement) { + if (const auto child = GetChild()) { + child->Measure(requirement); + return child->GetMeasuredSize(); + } else { + return Size{}; + } } void WindowRenderObject::OnLayoutContent(const Rect& content_rect) { -- cgit v1.2.3