From db00428f146a7daf2c8b5c4de6c8c1e317f950a4 Mon Sep 17 00:00:00 2001
From: Sine Striker <trueful@163.com>
Date: 周日, 10 12月 2023 23:46:31 +0800
Subject: [PATCH] Fix macro definition mistake
---
src/core/contexts/win32windowcontext_p.h | 49 ++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 42 insertions(+), 7 deletions(-)
diff --git a/src/core/contexts/win32windowcontext_p.h b/src/core/contexts/win32windowcontext_p.h
index 85ecf59..27b4e1f 100644
--- a/src/core/contexts/win32windowcontext_p.h
+++ b/src/core/contexts/win32windowcontext_p.h
@@ -9,16 +9,51 @@
class QWK_CORE_EXPORT Win32WindowContext : public AbstractWindowContext {
Q_OBJECT
public:
- Win32WindowContext(QWindow *window, WindowItemDelegate *delegate);
- ~Win32WindowContext();
+ Win32WindowContext();
+ ~Win32WindowContext() override;
- public:
- bool setup() override;
-
- bool windowProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam, LRESULT *result);
+ enum WindowPart {
+ Outside,
+ ClientArea,
+ ChromeButton,
+ ResizeBorder,
+ FixedBorder,
+ TitleBar,
+ };
protected:
- WId windowId;
+ 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
+ // is quite complex. Simultaneously, in order to make the handling code of other
+ // Windows messages clearer, we have separated them into this function.
+ bool snapLayoutHandler(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam,
+ LRESULT *result);
+
+ 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;
+
+ // The last hit test result, helpful to handle WM_MOUSEMOVE and WM_NCMOUSELEAVE.
+ WindowPart lastHitTestResult = WindowPart::Outside;
+
+ // Whether the last mouse leave message is blocked, mainly for handling the unexpected
+ // WM_MOUSELEAVE.
+ bool mouseLeaveBlocked = false;
+
+ bool centered = false;
};
}
--
Gitblit v1.9.1