From 8f8b7dfd056dfa23dd1989d3f3dfd3d5d91d0168 Mon Sep 17 00:00:00 2001 From: Yuqian Yang Date: Sat, 22 Nov 2025 21:24:18 +0800 Subject: Clean measure requirement codes. --- src/ui/controls/ControlHost.cpp | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) (limited to 'src/ui/controls') diff --git a/src/ui/controls/ControlHost.cpp b/src/ui/controls/ControlHost.cpp index f83aa1a2..caa907da 100644 --- a/src/ui/controls/ControlHost.cpp +++ b/src/ui/controls/ControlHost.cpp @@ -156,16 +156,15 @@ void ControlHost::Relayout() { void ControlHost::RelayoutWithSize(const Size& available_size, bool set_window_size_to_fit_content) { auto render_object = root_control_->GetRenderObject(); - render_object->Measure( - render::MeasureRequirement{ - available_size, - !set_window_size_to_fit_content && IsLayoutPreferToFillWindow() - ? render::MeasureSize(available_size) - : render::MeasureSize::NotSpecified()}, - render::MeasureSize::NotSpecified()); + render_object->Measure(render::MeasureRequirement{ + available_size, + !set_window_size_to_fit_content && IsLayoutPreferToFillWindow() + ? render::MeasureSize(available_size) + : render::MeasureSize::NotSpecified(), + render::MeasureSize::NotSpecified()}); if (set_window_size_to_fit_content) { - native_window_->SetClientSize(render_object->GetDesiredSize()); + native_window_->SetClientSize(render_object->GetMeasureResultSize()); } render_object->Layout(Point{}); -- cgit v1.2.3