From d18b5453d7ffd19667ee8ac125b34ab5328f0dc3 Mon Sep 17 00:00:00 2001 From: crupest Date: Wed, 9 Feb 2022 23:00:49 +0800 Subject: ... --- include/cru/ui/render/ScrollRenderObject.h | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) (limited to 'include/cru/ui/render/ScrollRenderObject.h') diff --git a/include/cru/ui/render/ScrollRenderObject.h b/include/cru/ui/render/ScrollRenderObject.h index 0890ec21..53c64c6c 100644 --- a/include/cru/ui/render/ScrollRenderObject.h +++ b/include/cru/ui/render/ScrollRenderObject.h @@ -1,10 +1,8 @@ #pragma once -#include "RenderObject.h" +#include "SingleChildRenderObject.h" +#include "ScrollBar.h" #include "cru/common/Event.h" -#include "cru/platform/graphics/util/Painter.h" -#include "cru/ui/Base.h" -#include "cru/ui/render/ScrollBar.h" #include #include @@ -18,7 +16,7 @@ namespace cru::ui::render { // Layout logic: // If child is smaller than content area, layout at lefttop. // Or layout by scroll state. -class CRU_UI_API ScrollRenderObject : public RenderObject { +class CRU_UI_API ScrollRenderObject : public SingleChildRenderObject { public: ScrollRenderObject(); @@ -27,9 +25,6 @@ class CRU_UI_API ScrollRenderObject : public RenderObject { ~ScrollRenderObject() override = default; - RenderObject* GetChild() const { return child_; } - void SetChild(RenderObject* new_child); - RenderObject* HitTest(const Point& point) override; // Return the coerced scroll offset. @@ -91,8 +86,6 @@ class CRU_UI_API ScrollRenderObject : public RenderObject { void InstallMouseWheelHandler(controls::Control* control); private: - RenderObject* child_; - Point scroll_offset_; std::unique_ptr scroll_bar_delegate_; -- cgit v1.2.3