From e0b59294fc9e9dc8198b8c504860353b6bec0124 Mon Sep 17 00:00:00 2001
From: Sine Striker <trueful@163.com>
Date: 周二, 07 5月 2024 21:14:12 +0800
Subject: [PATCH] Implement Windows SysMenu handling
---
src/core/contexts/win32windowcontext_p.h | 18 +++++++++++-------
1 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/src/core/contexts/win32windowcontext_p.h b/src/core/contexts/win32windowcontext_p.h
index ca64faf..208c48b 100644
--- a/src/core/contexts/win32windowcontext_p.h
+++ b/src/core/contexts/win32windowcontext_p.h
@@ -1,3 +1,7 @@
+// Copyright (C) 2023-2024 Stdware Collections (https://www.github.com/stdware)
+// Copyright (C) 2021-2023 wangwenx190 (Yuhang Zhao)
+// SPDX-License-Identifier: Apache-2.0
+
#ifndef WIN32WINDOWCONTEXT_P_H
#define WIN32WINDOWCONTEXT_P_H
@@ -29,6 +33,7 @@
FixedBorder,
TitleBar,
};
+ Q_ENUM(WindowPart)
QString key() const override;
void virtual_hook(int id, void *data) override;
@@ -36,7 +41,7 @@
QVariant windowAttribute(const QString &key) const override;
protected:
- void winIdChanged() override;
+ void winIdChanged(WId winId, WId oldWinId) override;
bool windowAttributeChanged(const QString &key, const QVariant &attribute,
const QVariant &oldAttribute) override;
@@ -47,7 +52,7 @@
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
+ // intercept and emulate 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,
@@ -60,16 +65,15 @@
LRESULT *result);
protected:
- WId windowId = 0;
-
// The last hit test result, helpful to handle WM_MOUSEMOVE and WM_NCMOUSELEAVE.
- WindowPart lastHitTestResult = WindowPart::Outside;
+ WindowPart lastHitTestResult;
+ int lastHitTestResultRaw;
// Whether the last mouse leave message is blocked, mainly for handling the unexpected
// WM_MOUSELEAVE.
- bool mouseLeaveBlocked = false;
+ bool mouseLeaveBlocked;
- bool initialCentered = false;
+ uint64_t iconButtonClickTime;
};
}
--
Gitblit v1.9.1