From fa380df5aa3a9c302760be3903eeebb6d866d8ee Mon Sep 17 00:00:00 2001
From: Sine Striker <trueful@163.com>
Date: 周五, 23 2月 2024 13:53:49 +0800
Subject: [PATCH] Fix typo in cmake config
---
src/core/contexts/win32windowcontext.cpp | 48 +++++++++++++-----------------------------------
1 files changed, 13 insertions(+), 35 deletions(-)
diff --git a/src/core/contexts/win32windowcontext.cpp b/src/core/contexts/win32windowcontext.cpp
index e0db522..a10b3e0 100644
--- a/src/core/contexts/win32windowcontext.cpp
+++ b/src/core/contexts/win32windowcontext.cpp
@@ -631,7 +631,7 @@
}
case DrawWindows10BorderHook2: {
- if (!m_windowHandle)
+ if (!m_windowId)
return;
// https://github.com/microsoft/terminal/blob/71a6f26e6ece656084e87de1a528c4a8072eeabd/src/cascadia/WindowsTerminal/NonClientIslandWindow.cpp#L1025
@@ -663,7 +663,7 @@
QVariant Win32WindowContext::windowAttribute(const QString &key) const {
if (key == QStringLiteral("window-rect")) {
- if (!m_windowHandle)
+ if (!m_windowId)
return {};
RECT frame{};
@@ -686,7 +686,7 @@
}
if (key == QStringLiteral("border-thickness")) {
- return m_windowHandle
+ return m_windowId
? int(getWindowFrameBorderThickness(reinterpret_cast<HWND>(m_windowId)))
: 0;
}
@@ -695,12 +695,16 @@
}
void Win32WindowContext::winIdChanged(WId winId, WId oldWinId) {
+ // Reset the context data
+ mouseLeaveBlocked = false;
+ lastHitTestResult = WindowPart::Outside;
+
// If the original window id is valid, remove all resources related
if (oldWinId) {
removeManagedWindow(reinterpret_cast<HWND>(oldWinId));
}
- if (!m_windowHandle || ! winId) {
+ if (!winId) {
return;
}
@@ -735,15 +739,11 @@
LRESULT *result) {
*result = FALSE;
- if (message == WM_DESTROY) {
- qDebug() << "WM_DESTROY";
- }
-
// We should skip these messages otherwise we will get crashes.
// NOTE: WM_QUIT won't be posted to the WindowProc function.
switch (message) {
- case WM_CLOSE:
case WM_DESTROY:
+ case WM_CLOSE:
case WM_NCDESTROY:
// Undocumented messages:
case WM_UAHDESTROYWINDOW:
@@ -755,20 +755,6 @@
if (!isValidWindow(hWnd, false, true)) {
return false;
- }
-
- switch (message) {
- case WM_NCMOUSELEAVE:
- qDebug() << "WM_NCMOUSELEAVE" << mouseLeaveBlocked;
- break;
- case WM_MOUSEHOVER:
- qDebug() << "WM_MOUSEHOVER" << mouseLeaveBlocked;
- break;
- case WM_NCMOUSEHOVER:
- qDebug() << "WM_NCMOUSEHOVER" << mouseLeaveBlocked;
- break;
- default:
- break;
}
// Test snap layout
@@ -1156,8 +1142,6 @@
}
}
mouseLeaveBlocked = false;
-
- qDebug() << "WM_MOUSELEAVE";
break;
}
@@ -1166,7 +1150,6 @@
// we unset `mouseLeaveBlocked` mark and pretend as if Qt has received
// WM_MOUSELEAVE.
if (lastHitTestResult != WindowPart::ChromeButton && mouseLeaveBlocked) {
- qDebug() << lastHitTestResult << "Track";
mouseLeaveBlocked = false;
requestForMouseLeaveMessage(hWnd, false);
}
@@ -1243,19 +1226,14 @@
// the above problems would not arise.
m_delegate->resetQtGrabbedControl(m_host);
+
+ // If the mouse moves from chrome buttons to other non-client areas, a
+ // WM_MOUSELEAVE message should be sent.
if (mouseLeaveBlocked) {
emulateClientAreaMessage(hWnd, message, wParam, lParam,
WM_NCMOUSELEAVE);
}
}
-
- // We need to make sure we get the right hit-test result when a WM_NCMOUSELEAVE
- // comes, so we reset it when we receive a WM_NCMOUSEMOVE.
-
- // If the mouse is entering the client area, there must be a WM_NCHITTEST
- // setting it to `Client` before the WM_NCMOUSELEAVE comes; if the mouse is
- // leaving the window, current window part remains as `Outside`.
- // lastHitTestResult = WindowPart::Outside;
}
if (currentWindowPart == WindowPart::ChromeButton) {
@@ -1287,7 +1265,7 @@
// pressing area as HTCLIENT which maybe because of our former retransmission of
// WM_NCLBUTTONDOWN, as a result, a WM_NCMOUSELEAVE will come immediately and a
// lot of WM_MOUSEMOVE will come if we move the mouse, we should track the mouse
- // in advance.
+ // in advance. (May be redundant?)
if (mouseLeaveBlocked) {
mouseLeaveBlocked = false;
requestForMouseLeaveMessage(hWnd, false);
--
Gitblit v1.9.1