...

2 files changed, 43 insertions, 5 deletions

diff --git a/include/cru/ui/ui_host.hpp b/include/cru/ui/ui_host.hpp
index 96026675..ca2b70a4 100644
--- a/include/cru/ui/ui_host.hpp
+++ b/include/cru/ui/ui_host.hpp
@@ -8,6 +8,29 @@
 namespace cru::ui {
 struct AfterLayoutEventArgs {};
 
+// The host of all controls and render objects.
+//
+// 3 situations on destroy:
+// 1. Native window destroyed, IsRetainAfterDestroy: false:
+// OnNativeDestroy(set native_window_destroyed_ to true, call ~Window due to
+// deleting_ is false and IsRetainAfterDestroy is false) -> ~Window ->
+// ~UiHost(not destroy native window repeatedly due to native_window_destroyed_
+// is true)
+// 2. Native window destroyed, IsRetainAfterDestroy: true:
+// OnNativeDestroy(set native_window_destroyed_ to true, not call ~Window
+// because deleting_ is false and IsRetainAfterDestroy is true)
+// then, ~Window -> ~UiHost(not destroy native window repeatedly due to
+// native_window_destroyed_ is true)
+// 3. Native window not destroyed, ~Window is called:
+// ~Window -> ~UiHost(set deleting_ to true, destroy native window
+// due to native_window_destroyed is false) -> OnNativeDestroy(not call ~Window
+// due to deleting_ is true and IsRetainAfterDestroy is whatever)
+// In conclusion:
+// 1. Set native_window_destroyed_ to true at the beginning of OnNativeDestroy.
+// 2. Set deleting_ to true at the beginning of ~UiHost.
+// 3. Destroy native window when native_window_destroy_ is false in ~Window.
+// 4. Delete Window when deleting_ is false and IsRetainAfterDestroy is false in
+// OnNativeDestroy.
 class UiHost : public Object, public SelfResolvable<UiHost> {
  public:
   // This will create root window render object and attach it to window.
@@ -71,6 +94,15 @@ class UiHost : public Object, public SelfResolvable<UiHost> {
 
   void UpdateCursor();
 
+  std::shared_ptr<platform::native::INativeWindowResolver>
+  GetNativeWindowResolver() {
+    return native_window_resolver_;
+  }
+
+  bool IsRetainAfterDestroy() { return retain_after_destroy_; }
+
+  void SetRetainAfterDestroy(bool destroy) { retain_after_destroy_ = destroy; }
+
  private:
   //*************** region: native messages ***************
   void OnNativeDestroy(platform::native::INativeWindow* window, std::nullptr_t);
@@ -113,6 +145,17 @@ class UiHost : public Object, public SelfResolvable<UiHost> {
   std::shared_ptr<platform::native::INativeWindowResolver>
       native_window_resolver_;
 
+  // See remarks of UiHost.
+  bool retain_after_destroy_ = false;
+  // See remarks of UiHost.
+  bool deleting_ = false;
+
+  // We need this because calling Resolve on resolver in handler of destroy
+  // event is bad and will always get the dying window. But we need to label the
+  // window as destroyed so the destructor will not destroy native window
+  // repeatedly. See remarks of UiHost.
+  bool native_window_destroyed_ = false;
+
   std::vector<EventRevokerGuard> event_revoker_guards_;
 
   Window* window_control_;
diff --git a/include/cru/ui/window.hpp b/include/cru/ui/window.hpp
index f15e605b..2f5df4da 100644
--- a/include/cru/ui/window.hpp
+++ b/include/cru/ui/window.hpp
@@ -28,9 +28,6 @@ class Window final : public ContentControl {
 
   render::RenderObject* GetRenderObject() const override;
 
-  bool IsRetainAfterDestroy() { return retain_after_destroy_; }
-  void SetRetainAfterDestroy(bool destroy) { retain_after_destroy_ = destroy; }
-
  protected:
   void OnChildChanged(Control* old_child, Control* new_child) override;
 
@@ -39,7 +36,5 @@ class Window final : public ContentControl {
 
   // UiHost is responsible to take care of lifetime of this.
   render::WindowRenderObject* render_object_;
-
-  bool retain_after_destroy_ = false;
 };
 }  // namespace cru::ui