...

3 files changed, 1 insertions, 260 deletions

diff --git a/src/ui/events/window_event.hpp b/src/ui/events/window_event.hpp
deleted file mode 100644
index 21c644af..00000000
--- a/src/ui/events/window_event.hpp
+++ /dev/null
@@ -1,42 +0,0 @@
-#pragma once
-#include "pre.hpp"
-
-#include <Windows.h>
-
-#include "ui_event.hpp"
-
-namespace cru::ui::events {
-struct WindowNativeMessage {
-  HWND hwnd;
-  int msg;
-  WPARAM w_param;
-  LPARAM l_param;
-};
-
-class WindowNativeMessageEventArgs : public UiEventArgs {
- public:
-  WindowNativeMessageEventArgs(Object* sender, Object* original_sender,
-                               const WindowNativeMessage& message)
-      : UiEventArgs(sender, original_sender),
-        message_(message),
-        result_(std::nullopt) {}
-  WindowNativeMessageEventArgs(const WindowNativeMessageEventArgs& other) =
-      default;
-  WindowNativeMessageEventArgs(WindowNativeMessageEventArgs&& other) = default;
-  WindowNativeMessageEventArgs& operator=(
-      const WindowNativeMessageEventArgs& other) = default;
-  WindowNativeMessageEventArgs& operator=(
-      WindowNativeMessageEventArgs&& other) = default;
-  ~WindowNativeMessageEventArgs() override = default;
-
-  WindowNativeMessage GetWindowMessage() const { return message_; }
-
-  std::optional<LRESULT> GetResult() const { return result_; }
-
-  void SetResult(const std::optional<LRESULT> result) { result_ = result; }
-
- private:
-  WindowNativeMessage message_;
-  std::optional<LRESULT> result_;
-};
-}
diff --git a/src/ui/window.cpp b/src/ui/window.cpp
index 91319db7..d138424f 100644
--- a/src/ui/window.cpp
+++ b/src/ui/window.cpp
@@ -97,54 +97,6 @@ Control* FindLowestCommonAncestor(Control* left, Control* right) {
 }
 }  // namespace
 
-LRESULT __stdcall GeneralWndProc(HWND hWnd, UINT Msg, WPARAM wParam,
-                                 LPARAM lParam) {
-  auto window = WindowManager::GetInstance()->FromHandle(hWnd);
-
-  LRESULT result;
-  if (window != nullptr &&
-      window->HandleWindowMessage(hWnd, Msg, wParam, lParam, result))
-    return result;
-
-  return DefWindowProc(hWnd, Msg, wParam, lParam);
-}
-
-WindowManager* WindowManager::GetInstance() {
-  return Application::GetInstance()->ResolveSingleton<WindowManager>(
-      [](auto) { return new WindowManager{}; });
-}
-
-WindowManager::WindowManager() {
-  general_window_class_ = std::make_unique<WindowClass>(
-      L"CruUIWindowClass", GeneralWndProc,
-      Application::GetInstance()->GetInstanceHandle());
-}
-
-void WindowManager::RegisterWindow(HWND hwnd, Window* window) {
-  assert(window_map_.count(hwnd) == 0);  // The hwnd is already in the map.
-  window_map_.emplace(hwnd, window);
-}
-
-void WindowManager::UnregisterWindow(HWND hwnd) {
-  const auto find_result = window_map_.find(hwnd);
-  assert(find_result != window_map_.end());  // The hwnd is not in the map.
-  window_map_.erase(find_result);
-  if (window_map_.empty()) Application::GetInstance()->Quit(0);
-}
-
-Window* WindowManager::FromHandle(HWND hwnd) {
-  const auto find_result = window_map_.find(hwnd);
-  if (find_result == window_map_.end())
-    return nullptr;
-  else
-    return find_result->second;
-}
-
-std::vector<Window*> WindowManager::GetAllWindows() const {
-  std::vector<Window*> windows;
-  for (auto [key, value] : window_map_) windows.push_back(value);
-  return windows;
-}
 
 inline Point PiToDip(const POINT& pi_point) {
   return Point(graph::PixelToDipX(pi_point.x), graph::PixelToDipY(pi_point.y));
@@ -217,10 +169,7 @@ void Window::AfterCreateHwnd(WindowManager* window_manager) {
 }
 
 Window::~Window() {
-  if (IsWindowValid()) {
-    SetDeleteThisOnDestroy(false);  // avoid double delete.
-    Close();
-  }
+
   TraverseDescendants(
       [this](Control* control) { control->OnDetachToWindow(this); });
 }
@@ -231,107 +180,6 @@ render::RenderObject* Window::GetRenderObject() const {
   return render_object_.get();
 }
 
-void Window::SetDeleteThisOnDestroy(bool value) {
-  delete_this_on_destroy_ = value;
-}
-
-void Window::Close() {
-  if (IsWindowValid()) DestroyWindow(hwnd_);
-}
-
-void Window::InvalidateDraw() {
-  if (IsWindowValid()) {
-    InvalidateRect(hwnd_, nullptr, false);
-  }
-}
-
-void Window::Show() {
-  if (IsWindowValid()) {
-    ShowWindow(hwnd_, SW_SHOWNORMAL);
-  }
-}
-
-void Window::Hide() {
-  if (IsWindowValid()) {
-    ShowWindow(hwnd_, SW_HIDE);
-  }
-}
-
-Size Window::GetClientSize() {
-  if (!IsWindowValid()) return Size();
-
-  const auto pixel_rect = GetClientRectPixel();
-  return Size(graph::PixelToDipX(pixel_rect.right),
-              graph::PixelToDipY(pixel_rect.bottom));
-}
-
-void Window::SetClientSize(const Size& size) {
-  if (IsWindowValid()) {
-    const auto window_style =
-        static_cast<DWORD>(GetWindowLongPtr(hwnd_, GWL_STYLE));
-    const auto window_ex_style =
-        static_cast<DWORD>(GetWindowLongPtr(hwnd_, GWL_EXSTYLE));
-
-    RECT rect;
-    rect.left = 0;
-    rect.top = 0;
-    rect.right = graph::DipToPixelX(size.width);
-    rect.bottom = graph::DipToPixelY(size.height);
-    AdjustWindowRectEx(&rect, window_style, FALSE, window_ex_style);
-
-    SetWindowPos(hwnd_, nullptr, 0, 0, rect.right - rect.left,
-                 rect.bottom - rect.top, SWP_NOZORDER | SWP_NOMOVE);
-  }
-}
-
-Rect Window::GetWindowRect() {
-  if (!IsWindowValid()) return Rect();
-
-  RECT rect;
-  ::GetWindowRect(hwnd_, &rect);
-
-  return Rect::FromVertices(
-      graph::PixelToDipX(rect.left), graph::PixelToDipY(rect.top),
-      graph::PixelToDipX(rect.right), graph::PixelToDipY(rect.bottom));
-}
-
-void Window::SetWindowRect(const Rect& rect) {
-  if (IsWindowValid()) {
-    SetWindowPos(hwnd_, nullptr, graph::DipToPixelX(rect.left),
-                 graph::DipToPixelY(rect.top),
-                 graph::DipToPixelX(rect.GetRight()),
-                 graph::DipToPixelY(rect.GetBottom()), SWP_NOZORDER);
-  }
-}
-
-void Window::SetWindowPosition(const Point& position) {
-  if (IsWindowValid()) {
-    SetWindowPos(hwnd_, nullptr, graph::DipToPixelX(position.x),
-                 graph::DipToPixelY(position.y), 0, 0,
-                 SWP_NOZORDER | SWP_NOSIZE);
-  }
-}
-
-Point Window::PointToScreen(const Point& point) {
-  if (!IsWindowValid()) return Point::Zero();
-
-  auto p = DipToPi(point);
-  if (::ClientToScreen(GetWindowHandle(), &p) == 0)
-    throw Win32Error(::GetLastError(),
-                     "Failed transform point from window to screen.");
-  return PiToDip(p);
-}
-
-Point Window::PointFromScreen(const Point& point) {
-  if (!IsWindowValid()) return Point::Zero();
-
-  auto p = DipToPi(point);
-  if (::ScreenToClient(GetWindowHandle(), &p) == 0)
-    throw Win32Error(::GetLastError(),
-                     "Failed transform point from screen to window.");
-  return PiToDip(p);
-}
-
 bool Window::HandleWindowMessage(HWND hwnd, int msg, WPARAM w_param,
                                  LPARAM l_param, LRESULT& result) {
   events::WindowNativeMessageEventArgs args(this, this,
diff --git a/src/ui/window.hpp b/src/ui/window.hpp
index f1d5386f..1e480454 100644
--- a/src/ui/window.hpp
+++ b/src/ui/window.hpp
@@ -19,45 +19,7 @@ class WindowRenderObject;
 }
 
 namespace cru::ui {
-class WindowManager : public Object {
- public:
-  static WindowManager* GetInstance();
-
- private:
-  WindowManager();
-
- public:
-  WindowManager(const WindowManager& other) = delete;
-  WindowManager(WindowManager&& other) = delete;
-  WindowManager& operator=(const WindowManager& other) = delete;
-  WindowManager& operator=(WindowManager&& other) = delete;
-  ~WindowManager() override = default;
-
-  // Get the general window class for creating ordinary window.
-  WindowClass* GetGeneralWindowClass() const {
-    return general_window_class_.get();
-  }
-
-  // Register a window newly created.
-  // This function adds the hwnd to hwnd-window map.
-  // It should be called immediately after a window was created.
-  void RegisterWindow(HWND hwnd, Window* window);
-
-  // Unregister a window that is going to be destroyed.
-  // This function removes the hwnd from the hwnd-window map.
-  // It should be called immediately before a window is going to be destroyed,
-  void UnregisterWindow(HWND hwnd);
 
-  // Return a pointer to the Window object related to the HWND or nullptr if the
-  // hwnd is not in the map.
-  Window* FromHandle(HWND hwnd);
-
-  std::vector<Window*> GetAllWindows() const;
-
- private:
-  std::unique_ptr<WindowClass> general_window_class_;
-  std::map<HWND, Window*> window_map_;
-};
 
 class Window final : public ContentControl {
   friend class WindowManager;
@@ -91,34 +53,11 @@ class Window final : public ContentControl {
 
   render::RenderObject* GetRenderObject() const override;
 
-  void SetDeleteThisOnDestroy(bool value);
-
-  //*************** region: handle ***************
 
-  // Get the handle of the window. Return null if window is invalid.
-  HWND GetWindowHandle() const { return hwnd_; }
 
-  // Return if the window is still valid, that is, hasn't been closed or
-  // destroyed.
-  bool IsWindowValid() const { return hwnd_ != nullptr; }
 
   //*************** region: window operations ***************
 
-  Window* GetParentWindow() const { return parent_window_; }
-
-  // Close and destroy the window if the window is valid.
-  void Close();
-
-  // Send a repaint message to the window's message queue which may make the
-  // window repaint.
-  void InvalidateDraw();
-
-  // Show the window.
-  void Show();
-
-  // Hide thw window.
-  void Hide();
-
   // Get the client size.
   Size GetClientSize();
 
@@ -222,10 +161,6 @@ class Window final : public ContentControl {
                                             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::shared_ptr<render::WindowRenderObject> render_object_{};