From 39d2c8b3d957e75c3a2a1c738c1628e3eb5c0173 Mon Sep 17 00:00:00 2001 From: crupest Date: Sat, 23 Mar 2019 00:15:18 +0800 Subject: ... --- src/ui/render/render_object.hpp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'src/ui/render/render_object.hpp') diff --git a/src/ui/render/render_object.hpp b/src/ui/render/render_object.hpp index a9950198..51b0c3ae 100644 --- a/src/ui/render/render_object.hpp +++ b/src/ui/render/render_object.hpp @@ -3,11 +3,13 @@ #include #include -#include "system_headers.hpp" #include "base.hpp" #include "ui/ui_base.hpp" +// forward declarations +struct ID2D1RenderTarget; + namespace cru::ui { class Control; } @@ -70,15 +72,14 @@ class RenderObject : public Object { virtual void OnSizeChanged(const Size& old_size, const Size& new_size); + virtual void OnMeasureCore(const Size& available_size); + virtual void OnLayoutCore(const Rect& rect); virtual Size OnMeasureContent(const Size& available_size) = 0; virtual void OnLayoutContent(const Rect& content_rect) = 0; private: void SetParent(RenderObject* new_parent); - void OnMeasureCore(const Size& available_size); - void OnLayoutCore(const Rect& rect); - private: Control* control_ = nullptr; -- cgit v1.2.3