sola/qwindowkit.git

			@@ -379,16 +379,7 @@
			getSystemMetricsForDpi(SM_CXPADDEDBORDER, dpi);
			}

			static void updateInternalWindowFrameMargins(HWND hwnd, QWindow *window) {
			const auto margins = [hwnd]() -> QMargins {
			const auto titleBarHeight = int(getTitleBarHeight(hwnd));
			if (isWin10OrGreater()) {
			return {0, -titleBarHeight, 0, 0};
			} else {
			const auto frameSize = int(getResizeBorderThickness(hwnd));
			return {-frameSize, -titleBarHeight, -frameSize, -frameSize};
			}
			}();
			static void setInternalWindowFrameMargins(QWindow *window, const QMargins &margins) {
			const QVariant marginsVar = QVariant::fromValue(margins);
			window->setProperty("_q_windowsCustomMargins", marginsVar);
			#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
			@@ -437,9 +428,12 @@
			}
			RECT currentWindowRect{};
			::GetWindowRect(hwnd, &currentWindowRect);
			auto newWindowX = activeMonitorRect.left + (currentWindowRect.left - currentMonitorRect.left);
			auto newWindowX =
			activeMonitorRect.left + (currentWindowRect.left - currentMonitorRect.left);
			auto newWindowY = activeMonitorRect.top + (currentWindowRect.top - currentMonitorRect.top);
			::SetWindowPos(hwnd, nullptr, newWindowX, newWindowY, RECT_WIDTH(currentWindowRect), RECT_HEIGHT(currentWindowRect), SWP_NOACTIVATE \| SWP_NOSIZE \| SWP_NOZORDER \| SWP_NOOWNERZORDER);
			::SetWindowPos(hwnd, nullptr, newWindowX, newWindowY, RECT_WIDTH(currentWindowRect),
			RECT_HEIGHT(currentWindowRect),
			SWP_NOACTIVATE \| SWP_NOSIZE \| SWP_NOZORDER \| SWP_NOOWNERZORDER);
			}

			static inline void bringWindowToFront(HWND hwnd) {
			@@ -466,7 +460,8 @@
			// First try to send a message to the current foreground window to check whether
			// it is currently hanging or not.
			if (!::SendMessageTimeoutW(oldForegroundWindow, WM_NULL, 0, 0,
			SMTO_BLOCK \| SMTO_ABORTIFHUNG \| SMTO_NOTIMEOUTIFNOTHUNG, 1000, nullptr)) {
			SMTO_BLOCK \| SMTO_ABORTIFHUNG \| SMTO_NOTIMEOUTIFNOTHUNG, 1000,
			nullptr)) {
			// The foreground window hangs, can't activate current window.
			return;
			}
			@@ -475,16 +470,12 @@
			// We won't be able to change a window's Z order if it's not our own window,
			// so we use this small technique to pretend the foreground window is ours.
			::AttachThreadInput(windowThreadProcessId, currentThreadId, TRUE);
			QWK_USED struct Cleaner {
			Cleaner(DWORD idAttach, DWORD idAttachTo) : m_idAttach(idAttach), m_idAttachTo(idAttachTo) {}
			~Cleaner() {
			::AttachThreadInput(m_idAttach, m_idAttachTo, FALSE);
			}
			private:
			Q_DISABLE_COPY(Cleaner)
			DWORD m_idAttach;
			DWORD m_idAttachTo;
			} cleaner{ windowThreadProcessId, currentThreadId };

			[[maybe_unused]] const auto &cleaner =
			qScopeGuard([windowThreadProcessId, currentThreadId]() {
			::AttachThreadInput(windowThreadProcessId, currentThreadId, FALSE); //
			});

			::BringWindowToTop(hwnd);
			// Activate the window too. This will force us to the virtual desktop this
			// window is on, if it's on another virtual desktop.
			@@ -829,7 +820,20 @@
			return ::CallWindowProcW(g_qtWindowProc, hWnd, message, wParam, lParam);
			}

			static inline void addManagedWindow(HWND hWnd, Win32WindowContext *ctx) {
			static inline void addManagedWindow(QWindow window, HWND hWnd, Win32WindowContext ctx) {
			const auto margins = [hWnd]() -> QMargins {
			const auto titleBarHeight = int(getTitleBarHeight(hWnd));
			if (isWin10OrGreater()) {
			return {0, -titleBarHeight, 0, 0};
			} else {
			const auto frameSize = int(getResizeBorderThickness(hWnd));
			return {-frameSize, -titleBarHeight, -frameSize, -frameSize};
			}
			}();

			// Inform Qt we want and have set custom margins
			setInternalWindowFrameMargins(window, margins);

			// Store original window proc
			if (!g_qtWindowProc) {
			g_qtWindowProc = reinterpret_cast<WNDPROC>(::GetWindowLongPtrW(hWnd, GWLP_WNDPROC));
			@@ -872,18 +876,24 @@
			void Win32WindowContext::virtual_hook(int id, void *data) {
			switch (id) {
			case CentralizeHook: {
			if (!windowId)
			return;
			const auto hwnd = reinterpret_cast<HWND>(windowId);
			moveWindowToDesktopCenter(hwnd);
			return;
			}

			case RaiseWindowHook: {
			if (!windowId)
			return;
			const auto hwnd = reinterpret_cast<HWND>(windowId);
			bringWindowToFront(hwnd);
			return;
			}

			case ShowSystemMenuHook: {
			if (!windowId)
			return;
			const auto &pos = static_cast<const QPoint >(data);
			auto hWnd = reinterpret_cast<HWND>(windowId);
			#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
			@@ -911,7 +921,7 @@
			}
			}

			break;
			return;
			}

			case DefaultColorsHook: {
			@@ -925,6 +935,9 @@
			}

			case DrawWindows10BorderHook: {
			if (!windowId)
			return;

			auto args = static_cast<void **>(data);
			auto &painter = static_cast<QPainter >(args[0]);
			const auto &rect = static_cast<const QRect >(args[1]);
			@@ -964,10 +977,8 @@
			return;
			}

			default: {
			// unreachable
			default:
			break;
			}
			}
			AbstractWindowContext::virtual_hook(id, data);
			}
			@@ -980,8 +991,13 @@
			return getWindowFrameBorderThickness(reinterpret_cast<HWND>(windowId));
			}

			void Win32WindowContext::winIdChanged(QWindow *oldWindow) {
			removeManagedWindow(reinterpret_cast<HWND>(windowId));
			void Win32WindowContext::winIdChanged() {
			// If the original window id is valid, remove all resources related
			if (windowId) {
			removeManagedWindow(reinterpret_cast<HWND>(windowId));
			windowId = 0;
			}

			if (!m_windowHandle) {
			return;
			}
			@@ -1000,11 +1016,8 @@
			}
			#endif

			// Inform Qt we want and have set custom margins
			updateInternalWindowFrameMargins(hWnd, m_windowHandle);

			// Add managed window
			addManagedWindow(hWnd, this);
			addManagedWindow(m_windowHandle, hWnd, this);

			// Cache win id
			windowId = winId;
			@@ -1268,6 +1281,53 @@
			const WindowPart currentWindowPart = lastHitTestResult;
			if (message == WM_NCMOUSEMOVE) {
			if (currentWindowPart != WindowPart::ChromeButton) {
			// https://github.com/qt/qtbase/blob/e26a87f1ecc40bc8c6aa5b889fce67410a57a702/src/widgets/kernel/qwidgetwindow.cpp#L472
			// When the mouse press event arrives, QWidgetWindow will implicitly grab
			// the top widget right under the mouse, and set `qt_button_down` to this
			// widget. At this time, no other widgets will accept the mouse event until
			// QWidgetWindow receives the mouse release event, then set `qt_button_down`
			// to null.

			// Imagine the following situation, now the main window has a pop-up menu,
			// the focus is not on the main window, if we click outside the pop-up menu,
			// the menu will close, which seems to be completely fine. But if we close
			// the menu by clicking on the title bar draggable area, then other widgets
			// won't accept the mouse message afterwards.

			// Here's the reason.
			// When the mouse is placed in the draggable area of the title bar, there
			// are two situations.

			// 1. If the focus is on the main window, and the last result of
			// WM_NCHITTEST is HTCAPTION, the mouse click event in the title bar is
			// taken over by Windows and Qt does not receive the mouse click event.

			// 2. If the main window has a pop-up menu, it is completely different. When
			// the mouse is pressed on the title bar, Windows sends the WM_LBUTTONDOWN
			// message to the window plane of the pop-up menu, the menu is closed, but
			// Qt will continue to forward the event to the QWidget under the mouse, and
			// the event will be processed by QWidgetWindow, causing the title bar
			// widget to be implicitly grabbed. After the menu is closed, Windows
			// immediately sends WM_NCHITTEST, because the mouse is in the title bar
			// draggable area, the result is HTCAPTION, so when the mouse is released,
			// Windows sends WM_NCLBUTTONUP, which is a non-client message, and it
			// will be ignored by Qt. As a consequence, QWidgetWindow can't receive a
			// mouse release message in the client area, so the grab remains, and other
			// widgets cannot receive mouse events.

			// Since we didn't watch the menu window, we cannot capture any mouse
			// press events sent by Windows, so we cannot solve this problem by
			// recording mouse events. Fortunately, we found that the main window will
			// receive a WM_NCMOUSEMOVE message immediately after the menu is closed, so
			// we just manually send a mouse release event when this message arrives and
			// set qt_button_down to null. Don't worry, when receiving WM_NCMOUSEMOVE,
			// there shouldn't be any control in the state of being grabbed.

			// In the native window, although QWidgetWindow handles the forwarded mouse
			// press event when the menu is closed, since the native title bar is not a
			// QWidget, no widget will be grabbed, and `qt_button_down` remains empty,
			// the above problems would not arise.

			m_delegate->resetQtGrabbedControl(m_host);
			if (mouseLeaveBlocked) {
			emulateClientAreaMessage(hWnd, message, wParam, lParam,
			@@ -1330,6 +1390,8 @@
			// window from client area, which means we will get previous window part as
			// HTCLIENT if the mouse leaves window from client area and enters window
			// from non-client area, but it has no bad effect.

			// Why do we need to call this function here?
			m_delegate->resetQtGrabbedControl(m_host);
			}
			}
			@@ -1439,7 +1501,6 @@
			// Terminal does, however, later I found that if we choose a proper
			// color, our homemade top border can almost have exactly the same
			// appearance with the system's one.

			[[maybe_unused]] const auto &hitTestRecorder = qScopeGuard([this, result]() {
			lastHitTestResult = getHitWindowPart(int(*result)); //
			});
			@@ -1562,7 +1623,7 @@
			*result = (isTitleBar ? HTCAPTION : HTCLIENT);
			return true;
			}
			// At this point, we know that the cursor is inside the client area
			// At this point, we know that the cursor is inside the client area,
			// so it has to be either the little border at the top of our custom
			// title bar or the drag bar. Apparently, it must be the drag bar or
			// the little border at the top which the user can use to move or