3 files changed, 78 insertions, 6 deletions

diff --git a/src/ui/control.hpp b/src/ui/control.hpp
index 0e078da2..8ac9ae72 100644
--- a/src/ui/control.hpp
+++ b/src/ui/control.hpp
@@ -11,7 +11,7 @@
 #include "events/ui_event.hpp"
 #include "border_property.hpp"
 #include "cursor.hpp"
-#include "any_map.h"
+#include "any_map.hpp"
 
 namespace cru::ui
 {
diff --git a/src/ui/window.cpp b/src/ui/window.cpp
index 349b78ff..2737b70b 100644
--- a/src/ui/window.cpp
+++ b/src/ui/window.cpp
@@ -113,8 +113,19 @@ namespace cru::ui
         }
     }
 
-    Window::Window() : Control(WindowConstructorTag{}, this), control_list_({ this }) {
+    Window* Window::CreateOverlapped()
+    {
+        return new Window(tag_overlapped_constructor{});
+    }
+
+    Window* Window::CreatePopup(Window* parent, const bool caption)
+    {
+        return new Window(tag_popup_constructor{}, parent, caption);
+    }
+
+    Window::Window(tag_overlapped_constructor) : Control(WindowConstructorTag{}, this), control_list_({ this }) {
         const auto window_manager = WindowManager::GetInstance();
+
         hwnd_ = CreateWindowEx(0,
             window_manager->GetGeneralWindowClass()->GetName(),
             L"", WS_OVERLAPPEDWINDOW,
@@ -125,6 +136,34 @@ namespace cru::ui
         if (hwnd_ == nullptr)
             throw std::runtime_error("Failed to create window.");
 
+        AfterCreateHwnd(window_manager);
+    }
+
+    Window::Window(tag_popup_constructor, Window* parent, const bool caption) : Control(WindowConstructorTag{}, this), control_list_({ this })
+    {
+        if (parent != nullptr && !parent->IsWindowValid())
+            throw std::runtime_error("Parent window is not valid.");
+
+        parent_window_ = parent;
+
+        const auto window_manager = WindowManager::GetInstance();
+
+        hwnd_ = CreateWindowEx(0,
+            window_manager->GetGeneralWindowClass()->GetName(),
+            L"", caption ? (WS_POPUPWINDOW | WS_CAPTION) : WS_POPUP,
+            CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT,
+            parent == nullptr ? nullptr : parent->GetWindowHandle(),
+            nullptr, Application::GetInstance()->GetInstanceHandle(), nullptr
+        );
+
+        if (hwnd_ == nullptr)
+            throw std::runtime_error("Failed to create window.");
+
+        AfterCreateHwnd(window_manager);
+    }
+
+    void Window::AfterCreateHwnd(WindowManager* window_manager)
+    {
         window_manager->RegisterWindow(hwnd_, this);
 
         render_target_ = graph::GraphManager::GetInstance()->CreateWindowRenderTarget(hwnd_);
@@ -133,7 +172,11 @@ namespace cru::ui
     }
 
     Window::~Window() {
-        Close();
+        if (IsWindowValid())
+        {
+            SetDeleteThisOnDestroy(false); // avoid double delete.
+            Close();
+        }
         TraverseDescendants([this](Control* control) {
             control->OnDetachToWindow(this);
         });
@@ -144,6 +187,11 @@ namespace cru::ui
         return control_type;
     }
 
+    void Window::SetDeleteThisOnDestroy(bool value)
+    {
+        delete_this_on_destroy_ = value;
+    }
+
     void Window::Close() {
         if (IsWindowValid())
             DestroyWindow(hwnd_);
@@ -521,6 +569,8 @@ namespace cru::ui
     void Window::OnDestroyInternal() {
         WindowManager::GetInstance()->UnregisterWindow(hwnd_);
         hwnd_ = nullptr;
+        if (delete_this_on_destroy_)
+            delete this;
     }
 
     void Window::OnPaintInternal() {
diff --git a/src/ui/window.hpp b/src/ui/window.hpp
index 2609594d..963bff78 100644
--- a/src/ui/window.hpp
+++ b/src/ui/window.hpp
@@ -83,13 +83,26 @@ namespace cru::ui
 
 
 
-    class Window : public Control
+    class Window final : public Control
     {
         friend class WindowManager;
     public:
         static constexpr auto control_type = L"Window";
 
-        Window();
+    public:
+        static Window* CreateOverlapped();
+        static Window* CreatePopup(Window* parent, bool caption = false);
+
+    private:
+        struct tag_overlapped_constructor {};
+        struct tag_popup_constructor {};
+
+        explicit Window(tag_overlapped_constructor);
+        Window(tag_popup_constructor, Window* parent, bool caption);
+
+        void AfterCreateHwnd(WindowManager* window_manager);
+
+    public:
         Window(const Window& other) = delete;
         Window(Window&& other) = delete;
         Window& operator=(const Window& other) = delete;
@@ -99,6 +112,8 @@ namespace cru::ui
     public:
         StringView GetControlType() const override final;
 
+        void SetDeleteThisOnDestroy(bool value);
+
         //*************** region: handle ***************
 
         //Get the handle of the window. Return null if window is invalid.
@@ -116,6 +131,11 @@ namespace cru::ui
 
         //*************** region: window operations ***************
 
+        Window* GetParentWindow() const
+        {
+            return parent_window_;
+        }
+
         //Close and destroy the window if the window is valid.
         void Close();
 
@@ -285,7 +305,10 @@ namespace cru::ui
         void DispatchMouseHoverControlChangeEvent(Control* old_control, Control * new_control, const Point& point);
  
     private:
+        bool delete_this_on_destroy_ = true;
+
         HWND hwnd_ = nullptr;
+        Window* parent_window_ = nullptr;
         std::shared_ptr<graph::WindowRenderTarget> render_target_{};
  
         std::list<Control*> control_list_{};
@@ -302,4 +325,3 @@ namespace cru::ui
 #endif
     };
 }
-