From 07d662aafc25b145eb20e4123ebc82b5736cdeb7 Mon Sep 17 00:00:00 2001 From: Yuqian Yang Date: Sun, 16 Nov 2025 14:09:50 +0800 Subject: New timer impl on Windows. Add Event test. Fix delete later. --- include/cru/platform/gui/win/Base.h | 2 -- include/cru/platform/gui/win/GodWindow.h | 34 ---------------------------- include/cru/platform/gui/win/UiApplication.h | 7 +++--- 3 files changed, 3 insertions(+), 40 deletions(-) delete mode 100644 include/cru/platform/gui/win/GodWindow.h (limited to 'include/cru/platform/gui') diff --git a/include/cru/platform/gui/win/Base.h b/include/cru/platform/gui/win/Base.h index 9c253950..1ef20ffd 100644 --- a/include/cru/platform/gui/win/Base.h +++ b/include/cru/platform/gui/win/Base.h @@ -17,8 +17,6 @@ namespace cru::platform::gui::win { using platform::win::HResultError; using platform::win::Win32Error; -class GodWindow; -class TimerManager; class WinCursor; class WinCursorManager; class WindowClass; diff --git a/include/cru/platform/gui/win/GodWindow.h b/include/cru/platform/gui/win/GodWindow.h deleted file mode 100644 index 22068ff5..00000000 --- a/include/cru/platform/gui/win/GodWindow.h +++ /dev/null @@ -1,34 +0,0 @@ -#pragma once -#include "Base.h" -#include "WindowNativeMessageEventArgs.h" - -#include - -#include - -namespace cru::platform::gui::win { -class CRU_WIN_GUI_API GodWindow : public Object { - CRU_DEFINE_CLASS_LOG_TAG("GodWindow") - - public: - explicit GodWindow(WinUiApplication* application); - ~GodWindow() override; - - HWND GetHandle() const { return hwnd_; } - - bool HandleGodWindowMessage(HWND hwnd, UINT msg, WPARAM w_param, - LPARAM l_param, LRESULT* result); - - IEvent* MessageEvent() { - return &message_event_; - } - - private: - WinUiApplication* application_; - - std::unique_ptr god_window_class_; - HWND hwnd_; - - Event message_event_; -}; -} // namespace cru::platform::gui::win diff --git a/include/cru/platform/gui/win/UiApplication.h b/include/cru/platform/gui/win/UiApplication.h index 9b1d011b..15c23148 100644 --- a/include/cru/platform/gui/win/UiApplication.h +++ b/include/cru/platform/gui/win/UiApplication.h @@ -2,6 +2,7 @@ #include "Base.h" #include +#include #include @@ -59,8 +60,6 @@ class CRU_WIN_GUI_API WinUiApplication : public WinNativeResource, HINSTANCE GetInstanceHandle() const { return instance_handle_; } - GodWindow* GetGodWindow() const { return god_window_.get(); } - TimerManager* GetTimerManager() const { return timer_manager_.get(); } WindowManager* GetWindowManager() const { return window_manager_.get(); } private: @@ -71,8 +70,8 @@ class CRU_WIN_GUI_API WinUiApplication : public WinNativeResource, std::unique_ptr graph_factory_; - std::unique_ptr god_window_; - std::unique_ptr timer_manager_; + TimerRegistry> timers_; + std::unique_ptr window_manager_; std::unique_ptr cursor_manager_; -- cgit v1.2.3