...

7 files changed, 41 insertions, 22 deletions

diff --git a/include/cru/platform/graph/graph_factory.hpp b/include/cru/platform/graph/graph_factory.hpp
index b2619e8d..60d4ed8a 100644
--- a/include/cru/platform/graph/graph_factory.hpp
+++ b/include/cru/platform/graph/graph_factory.hpp
@@ -15,10 +15,14 @@
 
 namespace cru::platform::graph {
 // Entry point of the graph module.
+// If you create a IUiApplication instance, then you should not create
+// IGraphFactory manually. IUiApplication will call
+// IGraphFactory::CreateInstance and set auto-delete to true.
+// The manual creation method of IGraphFactory provides a you a way to use graph
+// related tools without interact with actual ui like window system.
 struct IGraphFactory : virtual Interface, virtual IAutoDelete {
   // Create a platform-specific instance and save it as the global instance.
   // Do not create the instance twice. Implements should assert for that.
-  // After the
   // After creating, get the instance by GetInstance.
   static IGraphFactory* CreateInstance();
 
diff --git a/include/cru/platform/native/native_window.hpp b/include/cru/platform/native/native_window.hpp
index 0e076348..3a0fd3e1 100644
--- a/include/cru/platform/native/native_window.hpp
+++ b/include/cru/platform/native/native_window.hpp
@@ -10,7 +10,7 @@ struct IPainter;
 }
 
 namespace cru::platform::native {
-struct NativeWindow : public virtual Interface {
+struct INativeWindow : public virtual Interface {
   // Return if the window is still valid, that is, hasn't been closed or
   // destroyed.
   virtual bool IsValid() = 0;
@@ -18,7 +18,7 @@ struct NativeWindow : public virtual Interface {
 
   virtual void Close() = 0;
 
-  virtual NativeWindow* GetParent() = 0;
+  virtual INativeWindow* GetParent() = 0;
 
   virtual bool IsVisible() = 0;
   virtual void SetVisible(bool is_visible) = 0;
diff --git a/include/cru/platform/native/ui_applicaition.hpp b/include/cru/platform/native/ui_applicaition.hpp
index 0188393e..655b8ea0 100644
--- a/include/cru/platform/native/ui_applicaition.hpp
+++ b/include/cru/platform/native/ui_applicaition.hpp
@@ -1,16 +1,28 @@
 #pragma once
 #include "cru/common/base.hpp"
 
+#include "cru/common/auto_delete.hpp"
+
 #include <chrono>
 #include <functional>
 #include <vector>
 
 namespace cru::platform::native {
-struct NativeWindow;
+struct INativeWindow;
+
+// The entry point of a ui application.
+// It will call IGraphFactory::CreateInstance during its creation
+// and set graph factory to be auto deleted. If you want to keep
+// the graph factory then you should manually set it to false after
+// creating the ui application.
+struct IUiApplication : virtual Interface, virtual IAutoDelete {
+  // Create a platform-specific instance and save it as the global instance.
+  // Do not create the instance twice. Implements should assert for that.
+  // After creating, get the instance by GetInstance.
+  static IUiApplication* CreateInstance();
 
-struct UiApplication : public virtual Interface {
-  static UiApplication* CreateInstance();
-  static UiApplication* GetInstance();
+  // Get the global instance. If it is not created, then return nullptr.
+  static IUiApplication* GetInstance();
 
   virtual int Run() = 0;
   virtual void Quit(int quite_code) = 0;
@@ -24,7 +36,7 @@ struct UiApplication : public virtual Interface {
                                     const std::function<void()>& action) = 0;
   virtual void CancelTimer(unsigned long id) = 0;
 
-  virtual std::vector<NativeWindow*> GetAllWindow() = 0;
-  virtual NativeWindow* CreateWindow(NativeWindow* parent) = 0;
+  virtual std::vector<INativeWindow*> GetAllWindow() = 0;
+  virtual INativeWindow* CreateWindow(INativeWindow* parent) = 0;
 };
 }  // namespace cru::platform::ui
diff --git a/include/cru/ui/window.hpp b/include/cru/ui/window.hpp
index 140ac531..2ed05192 100644
--- a/include/cru/ui/window.hpp
+++ b/include/cru/ui/window.hpp
@@ -7,7 +7,7 @@
 #include <vector>
 
 namespace cru::platform::native {
-struct NativeWindow;
+struct INativeWindow;
 }
 
 namespace cru::ui {
@@ -39,7 +39,7 @@ class Window final : public ContentControl {
 
   render::RenderObject* GetRenderObject() const override;
 
-  platform::native::NativeWindow* GetNativeWindow() const { return native_window_; }
+  platform::native::INativeWindow* GetNativeWindow() const { return native_window_; }
 
   Control* GetMouseHoverControl() const { return mouse_hover_control_; }
 
@@ -82,7 +82,7 @@ class Window final : public ContentControl {
                                             const Point& point);
 
  private:
-  platform::native::NativeWindow* native_window_;
+  platform::native::INativeWindow* native_window_;
   std::vector<EventRevokerGuard> event_revoker_guards_;
 
   std::shared_ptr<render::WindowRenderObject> render_object_;
diff --git a/include/cru/win/graph/win_graph_factory.hpp b/include/cru/win/graph/win_graph_factory.hpp
index 02f1a0fc..2df7ed9a 100644
--- a/include/cru/win/graph/win_graph_factory.hpp
+++ b/include/cru/win/graph/win_graph_factory.hpp
@@ -8,7 +8,7 @@ namespace cru::win::graph {
 class WinGraphFactory : public Object,
                         public virtual platform::graph::IGraphFactory,
                         public virtual IWinNativeFactory {
-  friend IGraphFactory* ::cru::platform::graph::IGraphFactory::CreateInstance();
+  friend IGraphFactory* IGraphFactory::CreateInstance();
 
  public:
   static WinGraphFactory* GetInstance();
diff --git a/include/cru/win/native/win_application.hpp b/include/cru/win/native/win_application.hpp
index 5bdb753e..d3e705e1 100644
--- a/include/cru/win/native/win_application.hpp
+++ b/include/cru/win/native/win_application.hpp
@@ -11,14 +11,12 @@ class TimerManager;
 class WindowManager;
 
 class WinApplication : public Object,
-                       public virtual platform::native::UiApplication {
+                       public virtual platform::native::IUiApplication {
+  friend IUiApplication* IUiApplication::CreateInstance();
  public:
   static WinApplication* GetInstance();
 
  private:
-  static WinApplication* instance;
-
- private:
   explicit WinApplication(HINSTANCE h_instance);
 
  public:
@@ -41,9 +39,12 @@ class WinApplication : public Object,
                             const std::function<void()>& action) override;
   void CancelTimer(unsigned long id) override;
 
-  std::vector<platform::native::NativeWindow*> GetAllWindow() override;
-  platform::native::NativeWindow* CreateWindow(
-      platform::native::NativeWindow* parent) override;
+  std::vector<platform::native::INativeWindow*> GetAllWindow() override;
+  platform::native::INativeWindow* CreateWindow(
+      platform::native::INativeWindow* parent) override;
+
+  bool IsAutoDelete() const override { return auto_delete_; }
+  void SetAutoDelete(bool value) override { auto_delete_ = value; }
 
   HINSTANCE GetInstanceHandle() const { return h_instance_; }
 
@@ -52,6 +53,8 @@ class WinApplication : public Object,
   WindowManager* GetWindowManager() const { return window_manager_.get(); }
 
  private:
+  bool auto_delete_ = false;
+
   HINSTANCE h_instance_;
 
   std::shared_ptr<GodWindow> god_window_;
diff --git a/include/cru/win/native/win_native_window.hpp b/include/cru/win/native/win_native_window.hpp
index 272ca14b..0fafc7fd 100644
--- a/include/cru/win/native/win_native_window.hpp
+++ b/include/cru/win/native/win_native_window.hpp
@@ -13,7 +13,7 @@ class WindowManager;
 class WindowRenderTarget;
 
 class WinNativeWindow : public Object,
-                        public virtual platform::native::NativeWindow {
+                        public virtual platform::native::INativeWindow {
  public:
   WinNativeWindow(WinApplication* application,
                   std::shared_ptr<WindowClass> window_class, DWORD window_style,
@@ -29,7 +29,7 @@ class WinNativeWindow : public Object,
 
   void Close() override;
 
-  NativeWindow* GetParent() override { return parent_window_; }
+  INativeWindow* GetParent() override { return parent_window_; }
 
   bool IsVisible() override;
   void SetVisible(bool is_visible) override;