aboutsummaryrefslogtreecommitdiff
path: root/src/ui/render/CanvasRenderObject.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/ui/render/CanvasRenderObject.cpp')
-rw-r--r--src/ui/render/CanvasRenderObject.cpp9
1 files changed, 4 insertions, 5 deletions
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) {