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/render/CanvasRenderObject.cpp | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'src/ui/render/CanvasRenderObject.cpp') diff --git a/src/ui/render/CanvasRenderObject.cpp b/src/ui/render/CanvasRenderObject.cpp index b68f9afd..0c5ca3ed 100644 --- a/src/ui/render/CanvasRenderObject.cpp +++ b/src/ui/render/CanvasRenderObject.cpp @@ -12,13 +12,12 @@ RenderObject* CanvasRenderObject::HitTest(const Point& point) { void CanvasRenderObject::Draw(platform::graphics::IPainter* painter) { const auto rect = GetContentRect(); CanvasPaintEventArgs args{painter, rect.GetSize()}; - paint_event_.Raise(args); + PaintEvent_.Raise(args); } -Size CanvasRenderObject::OnMeasureContent(const MeasureRequirement& requirement, - const MeasureSize& preferred_size) { - return requirement.Coerce(Size{preferred_size.width.GetLengthOr(100), - preferred_size.height.GetLengthOr(100)}); +Size CanvasRenderObject::OnMeasureContent( + const MeasureRequirement& requirement) { + return requirement.Coerce(requirement.suggest.GetSizeOr({100, 100})); } void CanvasRenderObject::OnLayoutContent(const Rect& content_rect) { -- cgit v1.2.3