Merge pull request #26 from crupest/3-scrollview

Develop scrollview.

1 files changed, 5 insertions, 13 deletions

diff --git a/src/ui/window.hpp b/src/ui/window.hpp
index d98e60e2..e82aa585 100644
--- a/src/ui/window.hpp
+++ b/src/ui/window.hpp
@@ -1,8 +1,10 @@
 #pragma once
 
+// ReSharper disable once CppUnusedIncludeDirective
+#include "pre.hpp"
+
 #include "system_headers.hpp"
 #include <map>
-#include <list>
 #include <memory>
 
 #include "control.hpp"
@@ -208,15 +210,6 @@ namespace cru::ui
 
         void SetSizeFitContent(const Size& max_size = Size(1000, 1000));
 
-        //*************** region: functions ***************
-
-        //Refresh control list.
-        //It should be invoked every time a control is added or removed from the tree.
-        void RefreshControlList();
-
-        //Get the most top control at "point".
-        Control* HitTest(const Point& point);
-
 
         //*************** region: focus ***************
 
@@ -277,7 +270,8 @@ namespace cru::ui
         void OnMouseLeaveInternal();
         void OnMouseDownInternal(MouseButton button, POINT point);
         void OnMouseUpInternal(MouseButton button, POINT point);
- 
+
+        void OnMouseWheelInternal(short delta, POINT point);
         void OnKeyDownInternal(int virtual_code);
         void OnKeyUpInternal(int virtual_code);
         void OnCharInternal(wchar_t c);
@@ -320,8 +314,6 @@ namespace cru::ui
         Window* parent_window_ = nullptr;
         std::shared_ptr<graph::WindowRenderTarget> render_target_{};
  
-        std::list<Control*> control_list_{};
- 
         Control* mouse_hover_control_ = nullptr;
  
         bool window_focus_ = false;