From ad494e6b019b9fea2daf3aa8ff17b37f79554528 Mon Sep 17 00:00:00 2001 From: Yuhang Zhao <zhaoyuhang@rankyee.com> Date: 周一, 11 12月 2023 15:04:31 +0800 Subject: [PATCH] fix QML & Qt6 --- src/core/contexts/win32windowcontext_p.h | 14 ++++++++++++-- 1 files changed, 12 insertions(+), 2 deletions(-) diff --git a/src/core/contexts/win32windowcontext_p.h b/src/core/contexts/win32windowcontext_p.h index 0d7b14b..a56aac8 100644 --- a/src/core/contexts/win32windowcontext_p.h +++ b/src/core/contexts/win32windowcontext_p.h @@ -21,10 +21,17 @@ TitleBar, }; - public: - bool setup(QObject *host, WindowItemDelegate *delegate) override; + QString key() const override; + void virtual_hook(int id, void *data) override; + protected: + bool setupHost() override; + + public: bool windowProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam, LRESULT *result); + + bool systemMenuHandler(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam, + LRESULT *result); // In order to perfectly apply Windows 11 Snap Layout into the Qt window, we need to // intercept and simulate most of the mouse events, so that the processing logic @@ -36,6 +43,9 @@ bool customWindowHandler(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam, LRESULT *result); + bool nonClientCalcSizeHandler(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam, + LRESULT *result); + protected: WId windowId = 0; -- Gitblit v1.9.1