From 477155d6fccc8eafadb6d7f4c468c9141d7d4e92 Mon Sep 17 00:00:00 2001
From: crupest <crupest@outlook.com>
Date: Wed, 18 Mar 2020 22:37:41 +0800
Subject: ...

---
 include/cru/platform/native/base.hpp           | 43 ++++++++++++++++++++++++++
 include/cru/platform/native/basic_types.hpp    | 23 --------------
 include/cru/platform/native/cursor.hpp         |  7 +----
 include/cru/platform/native/event.hpp          | 15 ---------
 include/cru/platform/native/ui_application.hpp |  9 +-----
 include/cru/platform/native/window.hpp         | 12 +------
 6 files changed, 46 insertions(+), 63 deletions(-)
 create mode 100644 include/cru/platform/native/base.hpp
 delete mode 100644 include/cru/platform/native/basic_types.hpp
 delete mode 100644 include/cru/platform/native/event.hpp

(limited to 'include/cru/platform')

diff --git a/include/cru/platform/native/base.hpp b/include/cru/platform/native/base.hpp
new file mode 100644
index 00000000..d62dc56b
--- /dev/null
+++ b/include/cru/platform/native/base.hpp
@@ -0,0 +1,43 @@
+#pragma once
+#include "cru/common/base.hpp"
+#include "cru/common/bitmask.hpp"
+#include "cru/platform/graph/base.hpp"
+
+namespace cru::platform::native {
+struct ICursor;
+struct ICursorManager;
+struct IUiApplication;
+struct INativeWindow;
+struct INativeWindowResolver;
+
+struct Dpi {
+  float x;
+  float y;
+};
+
+namespace details {
+struct TagMouseButton {};
+}  // namespace details
+
+using MouseButton = Bitmask<details::TagMouseButton>;
+
+namespace mouse_buttons {
+constexpr MouseButton left{0b1};
+constexpr MouseButton middle{0b10};
+constexpr MouseButton right{0b100};
+}  // namespace mouse_buttons
+
+enum class SystemCursorType {
+  Arrow,
+  Hand,
+};
+
+struct NativeMouseButtonEventArgs {
+  MouseButton button;
+  Point point;
+};
+
+enum class FocusChangeType { Gain, Lost };
+
+enum class MouseEnterLeaveType { Enter, Leave };
+}  // namespace cru::platform::native
diff --git a/include/cru/platform/native/basic_types.hpp b/include/cru/platform/native/basic_types.hpp
deleted file mode 100644
index 84cc61d1..00000000
--- a/include/cru/platform/native/basic_types.hpp
+++ /dev/null
@@ -1,23 +0,0 @@
-#pragma once
-#include "cru/common/base.hpp"
-#include "cru/common/bitmask.hpp"
-
-namespace cru::platform::native {
-struct Dpi {
-  float x;
-  float y;
-};
-
-namespace details {
-struct TagMouseButton {};
-}  // namespace details
-
-using MouseButton = Bitmask<details::TagMouseButton>;
-
-namespace mouse_buttons {
-constexpr MouseButton left{0b1};
-constexpr MouseButton middle{0b10};
-constexpr MouseButton right{0b100};
-}  // namespace mouse_buttons
-
-}  // namespace cru::platform::native
diff --git a/include/cru/platform/native/cursor.hpp b/include/cru/platform/native/cursor.hpp
index cb8b7ed2..eae51ffe 100644
--- a/include/cru/platform/native/cursor.hpp
+++ b/include/cru/platform/native/cursor.hpp
@@ -1,17 +1,12 @@
 #pragma once
-
 #include "../resource.hpp"
+#include "base.hpp"
 
 #include <memory>
 
 namespace cru::platform::native {
 struct ICursor : virtual INativeResource {};
 
-enum class SystemCursorType {
-  Arrow,
-  Hand,
-};
-
 struct ICursorManager : virtual INativeResource {
   virtual std::shared_ptr<ICursor> GetSystemCursor(SystemCursorType type) = 0;
 
diff --git a/include/cru/platform/native/event.hpp b/include/cru/platform/native/event.hpp
deleted file mode 100644
index 48e9cfca..00000000
--- a/include/cru/platform/native/event.hpp
+++ /dev/null
@@ -1,15 +0,0 @@
-#pragma once
-
-#include "../graph_base.hpp"
-#include "basic_types.hpp"
-
-namespace cru::platform::native {
-struct NativeMouseButtonEventArgs {
-  MouseButton button;
-  Point point;
-};
-
-enum class FocusChangeType { Gain, Lost };
-
-enum class MouseEnterLeaveType { Enter, Leave };
-}  // namespace cru::platform::native
diff --git a/include/cru/platform/native/ui_application.hpp b/include/cru/platform/native/ui_application.hpp
index e02904bb..0825251e 100644
--- a/include/cru/platform/native/ui_application.hpp
+++ b/include/cru/platform/native/ui_application.hpp
@@ -1,20 +1,13 @@
 #pragma once
 #include "../resource.hpp"
+#include "base.hpp"
 
 #include <chrono>
 #include <functional>
 #include <memory>
 #include <vector>
 
-namespace cru::platform::graph {
-struct IGraphFactory;
-}
-
 namespace cru::platform::native {
-struct INativeWindow;
-struct INativeWindowResolver;
-struct ICursorManager;
-
 // The entry point of a ui application.
 struct IUiApplication : public virtual INativeResource {
  public:
diff --git a/include/cru/platform/native/window.hpp b/include/cru/platform/native/window.hpp
index 9f2e2e71..85f809e5 100644
--- a/include/cru/platform/native/window.hpp
+++ b/include/cru/platform/native/window.hpp
@@ -1,19 +1,9 @@
 #pragma once
 #include "../resource.hpp"
-
-#include "../graph_base.hpp"
-#include "basic_types.hpp"
+#include "base.hpp"
 #include "cru/common/event.hpp"
-#include "cursor.hpp"
-#include "event.hpp"
-
-namespace cru::platform::graph {
-struct IPainter;
-}
 
 namespace cru::platform::native {
-struct INativeWindowResolver;
-
 // Represents a native window, which exposes some low-level events and
 // operations.
 //
-- 
cgit v1.2.3