From 1900ef3c9805d7fe15e0634cef9b5ff2a5dc7838 Mon Sep 17 00:00:00 2001 From: SineStriker <trueful@163.com> Date: 周三, 20 12月 2023 20:02:05 +0800 Subject: [PATCH] minor tweaks --- src/core/contexts/win32windowcontext.cpp | 415 +++++++++++++++++++++++++++++++++++++++++----------------- 1 files changed, 293 insertions(+), 122 deletions(-) diff --git a/src/core/contexts/win32windowcontext.cpp b/src/core/contexts/win32windowcontext.cpp index 297c39c..7a8ad24 100644 --- a/src/core/contexts/win32windowcontext.cpp +++ b/src/core/contexts/win32windowcontext.cpp @@ -4,6 +4,7 @@ #include <QtCore/QHash> #include <QtCore/QScopeGuard> +#include <QtCore/QTimer> #include <QtGui/QGuiApplication> #include <QtGui/QPainter> #include <QtGui/QPalette> @@ -26,7 +27,6 @@ #include <dwmapi.h> #include <timeapi.h> -#include "nativeeventfilter.h" #include "qwkglobal_p.h" #if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) @@ -79,16 +79,6 @@ // Original Qt window proc function static WNDPROC g_qtWindowProc = nullptr; - // ### FIXME FIXME FIXME - // ### FIXME: Tell the user to call in the documentation, instead of automatically - // calling it directly. - // ### FIXME FIXME FIXME - static struct QWK_Hook { - QWK_Hook() { - qApp->setAttribute(Qt::AA_DontCreateNativeWidgetSiblings); - } - } g_hook{}; - struct DynamicApis { static const DynamicApis &instance() { static const DynamicApis inst{}; @@ -114,6 +104,7 @@ DYNAMIC_API_DECLARE(DwmIsCompositionEnabled); DYNAMIC_API_DECLARE(DwmGetCompositionTimingInfo); DYNAMIC_API_DECLARE(DwmGetWindowAttribute); + DYNAMIC_API_DECLARE(DwmSetWindowAttribute); DYNAMIC_API_DECLARE(GetDpiForWindow); DYNAMIC_API_DECLARE(GetSystemMetricsForDpi); DYNAMIC_API_DECLARE(GetDpiForMonitor); @@ -140,6 +131,7 @@ DYNAMIC_API_RESOLVE(dwmapi, DwmIsCompositionEnabled); DYNAMIC_API_RESOLVE(dwmapi, DwmGetCompositionTimingInfo); DYNAMIC_API_RESOLVE(dwmapi, DwmGetWindowAttribute); + DYNAMIC_API_RESOLVE(dwmapi, DwmSetWindowAttribute); QSystemLibrary winmm(QStringLiteral("winmm")); DYNAMIC_API_RESOLVE(winmm, timeGetDevCaps); @@ -357,44 +349,37 @@ } } - static inline quint32 getWindowFrameBorderThickness(HWND hwnd) { - UINT result = 0; + static inline quint32 getSystemMetricsForDpi(int index, quint32 dpi) { const DynamicApis &apis = DynamicApis::instance(); - if (SUCCEEDED(apis.pDwmGetWindowAttribute(hwnd, _DWMWA_VISIBLE_FRAME_BORDER_THICKNESS, - &result, sizeof(result)))) { - return result; - } else { - const quint32 dpi = getDpiForWindow(hwnd); - result = quint32(std::round(qreal(1) * qreal(dpi) / qreal(USER_DEFAULT_SCREEN_DPI))); + if (apis.pGetSystemMetricsForDpi) { + return ::GetSystemMetricsForDpi(index, dpi); + } + return ::GetSystemMetrics(index); + } + + static inline quint32 getWindowFrameBorderThickness(HWND hwnd) { + const DynamicApis &apis = DynamicApis::instance(); + if (UINT result = 0; SUCCEEDED(apis.pDwmGetWindowAttribute( + hwnd, _DWMWA_VISIBLE_FRAME_BORDER_THICKNESS, &result, sizeof(result)))) { return result; } + return getSystemMetricsForDpi(SM_CXBORDER, getDpiForWindow(hwnd)); } static inline quint32 getResizeBorderThickness(HWND hwnd) { - const DynamicApis &apis = DynamicApis::instance(); - if (apis.pGetSystemMetricsForDpi) { - const quint32 dpi = getDpiForWindow(hwnd); - return apis.pGetSystemMetricsForDpi(SM_CXSIZEFRAME, dpi) + - apis.pGetSystemMetricsForDpi(SM_CXPADDEDBORDER, dpi); - } else { - return ::GetSystemMetrics(SM_CXSIZEFRAME) + ::GetSystemMetrics(SM_CXPADDEDBORDER); - } + const quint32 dpi = getDpiForWindow(hwnd); + return getSystemMetricsForDpi(SM_CXSIZEFRAME, dpi) + + getSystemMetricsForDpi(SM_CXPADDEDBORDER, dpi); } static inline quint32 getTitleBarHeight(HWND hwnd) { - const auto captionHeight = [hwnd]() -> int { - const DynamicApis &apis = DynamicApis::instance(); - if (apis.pGetSystemMetricsForDpi) { - const quint32 dpi = getDpiForWindow(hwnd); - return apis.pGetSystemMetricsForDpi(SM_CYCAPTION, dpi); - } else { - return ::GetSystemMetrics(SM_CYCAPTION); - } - }(); - return captionHeight + getResizeBorderThickness(hwnd); + const quint32 dpi = getDpiForWindow(hwnd); + return getSystemMetricsForDpi(SM_CYCAPTION, dpi) + + getSystemMetricsForDpi(SM_CXSIZEFRAME, dpi) + + getSystemMetricsForDpi(SM_CXPADDEDBORDER, dpi); } - static inline void updateInternalWindowFrameMargins(HWND hwnd, QWindow *window) { + static void updateInternalWindowFrameMargins(HWND hwnd, QWindow *window) { const auto margins = [hwnd]() -> QMargins { const auto titleBarHeight = int(getTitleBarHeight(hwnd)); if (isWin10OrGreater()) { @@ -429,16 +414,83 @@ monitorInfo.cbSize = sizeof(monitorInfo); ::GetMonitorInfoW(monitor, &monitorInfo); return monitorInfo; - }; + } - static inline void moveToDesktopCenter(HWND hwnd) { - const auto monitorInfo = getMonitorForWindow(hwnd); + static inline void moveWindowToDesktopCenter(HWND hwnd) { + MONITORINFOEXW monitorInfo = getMonitorForWindow(hwnd); RECT windowRect{}; ::GetWindowRect(hwnd, &windowRect); - const auto newX = (RECT_WIDTH(monitorInfo.rcMonitor) - RECT_WIDTH(windowRect)) / 2; - const auto newY = (RECT_HEIGHT(monitorInfo.rcMonitor) - RECT_HEIGHT(windowRect)) / 2; + const auto newX = monitorInfo.rcMonitor.left + + (RECT_WIDTH(monitorInfo.rcMonitor) - RECT_WIDTH(windowRect)) / 2; + const auto newY = monitorInfo.rcMonitor.top + + (RECT_HEIGHT(monitorInfo.rcMonitor) - RECT_HEIGHT(windowRect)) / 2; ::SetWindowPos(hwnd, nullptr, newX, newY, 0, 0, SWP_NOACTIVATE | SWP_NOSIZE | SWP_NOZORDER | SWP_NOOWNERZORDER); + } + + static inline void moveWindowToMonitor(HWND hwnd, const MONITORINFOEXW &activeMonitor) { + RECT currentMonitorRect = getMonitorForWindow(hwnd).rcMonitor; + RECT activeMonitorRect = activeMonitor.rcMonitor; + // We are in the same monitor, nothing to adjust here. + if (currentMonitorRect == activeMonitorRect) { + return; + } + RECT currentWindowRect{}; + ::GetWindowRect(hwnd, ¤tWindowRect); + 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); + } + + static inline void bringWindowToFront(HWND hwnd) { + HWND oldForegroundWindow = ::GetForegroundWindow(); + if (!oldForegroundWindow) { + // The foreground window can be NULL, it's not an API error. + return; + } + MONITORINFOEXW activeMonitor = getMonitorForWindow(oldForegroundWindow); + // We need to show the window first, otherwise we won't be able to bring it to front. + if (!::IsWindowVisible(hwnd)) { + ::ShowWindow(hwnd, SW_SHOW); + } + if (IsMinimized(hwnd)) { + // Restore the window if it is minimized. + ::ShowWindow(hwnd, SW_RESTORE); + // Once we've been restored, throw us on the active monitor. + moveWindowToMonitor(hwnd, activeMonitor); + // When the window is restored, it will always become the foreground window. + // So return early here, we don't need the following code to bring it to front. + return; + } + // OK, our window is not minimized, so now we will try to bring it to front manually. + // 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)) { + // The foreground window hangs, can't activate current window. + return; + } + DWORD windowThreadProcessId = ::GetWindowThreadProcessId(oldForegroundWindow, nullptr); + DWORD currentThreadId = ::GetCurrentThreadId(); + // 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); + + [[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. + ::SetActiveWindow(hwnd); + // Throw us on the active monitor. + moveWindowToMonitor(hwnd, activeMonitor); } static inline bool isFullScreen(HWND hwnd) { @@ -455,12 +507,15 @@ ::GetWindowPlacement(hwnd, &wp); return ((wp.showCmd == SW_NORMAL) || (wp.showCmd == SW_RESTORE)); #else + if (isFullScreen(hwnd)) { + return false; + } const auto style = static_cast<DWORD>(::GetWindowLongPtrW(hwnd, GWL_STYLE)); return (!(style & (WS_MINIMIZE | WS_MAXIMIZE))); #endif } - static inline void syncPaintEventWithDwm() { + static void syncPaintEventWithDwm() { // No need to sync with DWM if DWM composition is disabled. if (!isDwmCompositionEnabled()) { return; @@ -505,9 +560,9 @@ apis.ptimeEndPeriod(ms_granularity); } - static inline void showSystemMenu2(HWND hWnd, const POINT &pos, const bool selectFirstEntry, - const bool fixedSize) { - const HMENU hMenu = ::GetSystemMenu(hWnd, FALSE); + static void showSystemMenu2(HWND hWnd, const POINT &pos, const bool selectFirstEntry, + const bool fixedSize) { + HMENU hMenu = ::GetSystemMenu(hWnd, FALSE); if (!hMenu) { // The corresponding window doesn't have a system menu, most likely due to the // lack of the "WS_SYSMENU" window style. This situation should not be treated @@ -641,7 +696,7 @@ // DefWindowProc(). Consequently, we have to add a global native filter that forwards the result // of the hook function, telling Qt whether we have filtered the events before. Since Qt only // handles Windows window messages in the main thread, it is safe to do so. - class WindowsNativeEventFilter : public NativeEventFilter { + class WindowsNativeEventFilter : public AppNativeEventFilter { public: bool nativeEventFilter(const QByteArray &eventType, void *message, QT_NATIVE_EVENT_RESULT_TYPE *result) override { @@ -774,18 +829,45 @@ return ::CallWindowProcW(g_qtWindowProc, hWnd, message, wParam, lParam); } + static inline void addManagedWindow(HWND hWnd, Win32WindowContext *ctx) { + // Store original window proc + if (!g_qtWindowProc) { + g_qtWindowProc = reinterpret_cast<WNDPROC>(::GetWindowLongPtrW(hWnd, GWLP_WNDPROC)); + } + + // Hook window proc + ::SetWindowLongPtrW(hWnd, GWLP_WNDPROC, reinterpret_cast<LONG_PTR>(QWKHookedWndProc)); + + // Install global native event filter + WindowsNativeEventFilter::install(); + + // Save window handle mapping + g_wndProcHash->insert(hWnd, ctx); + } + + template <bool Destroyed = true> + static inline void removeManagedWindow(HWND hWnd) { + // Remove window handle mapping + if (!g_wndProcHash->remove(hWnd)) + return; + + // Remove event filter if the all windows has been destroyed + if (g_wndProcHash->empty()) { + WindowsNativeEventFilter::uninstall(); + } + + // Restore window proc + if constexpr (!Destroyed) { + ::SetWindowLongPtrW(hWnd, GWLP_WNDPROC, reinterpret_cast<LONG_PTR>(g_qtWindowProc)); + } + } + Win32WindowContext::Win32WindowContext() : AbstractWindowContext() { } Win32WindowContext::~Win32WindowContext() { - // Remove window handle mapping - if (auto hWnd = reinterpret_cast<HWND>(windowId); hWnd) { - g_wndProcHash->remove(hWnd); - - // Remove event filter if the all windows has been destroyed - if (g_wndProcHash->empty()) { - WindowsNativeEventFilter::uninstall(); - } + if (windowId) { + removeManagedWindow(reinterpret_cast<HWND>(windowId)); } } @@ -796,62 +878,70 @@ void Win32WindowContext::virtual_hook(int id, void *data) { switch (id) { case CentralizeHook: { - const auto hwnd = reinterpret_cast<HWND>(m_windowHandle->winId()); - moveToDesktopCenter(hwnd); + const auto hwnd = reinterpret_cast<HWND>(windowId); + moveWindowToDesktopCenter(hwnd); + return; + } + + case RaiseWindowHook: { + const auto hwnd = reinterpret_cast<HWND>(windowId); + bringWindowToFront(hwnd); return; } case ShowSystemMenuHook: { const auto &pos = *static_cast<const QPoint *>(data); - auto hWnd = reinterpret_cast<HWND>(m_windowHandle->winId()); - showSystemMenu2(hWnd, qpoint2point(pos), false, + auto hWnd = reinterpret_cast<HWND>(windowId); +#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) + const QPoint nativeGlobalPos = + QHighDpi::toNativeGlobalPosition(pos, m_windowHandle); +#else + const QPoint nativeGlobalPos = QHighDpi::toNativePixels(pos, m_windowHandle); +#endif + showSystemMenu2(hWnd, qpoint2point(nativeGlobalPos), false, m_delegate->isHostSizeFixed(m_host)); return; } - case NeedsDrawBordersHook: { - auto &result = *static_cast<bool *>(data); - result = isWin10OrGreater() && !isWin11OrGreater(); - return; - } - - case BorderThicknessHook: { + case WindowAttributeChangedHook: { auto args = static_cast<void **>(data); - const bool requireNative = *static_cast<const bool *>(args[0]); - quint32 &thickness = *static_cast<quint32 *>(args[1]); - const auto hwnd = reinterpret_cast<HWND>(m_windowHandle->winId()); - const auto nativeThickness = getWindowFrameBorderThickness(hwnd); - thickness = requireNative - ? nativeThickness - : QHighDpi::fromNativePixels(nativeThickness, m_windowHandle); + const auto &key = *static_cast<const QString *>(args[0]); + const auto &newVar = *static_cast<const QVariant *>(args[1]); + const auto &oldVar = *static_cast<const QVariant *>(args[2]); + + if (key == QStringLiteral("no-frame-shadow")) { + if (newVar.toBool()) { + // TODO: set off + } else { + // TODO: set on + } + } + return; } - case BorderColorsHook: { - auto arr = *reinterpret_cast<QList<QColor> *>(data); - arr.clear(); - arr.push_back(kWindowsColorSet.activeLight); - arr.push_back(kWindowsColorSet.activeDark); - arr.push_back(kWindowsColorSet.inactiveLight); - arr.push_back(kWindowsColorSet.inactiveDark); + case DefaultColorsHook: { + auto &map = *static_cast<QMap<QString, QColor> *>(data); + map.clear(); + map.insert(QStringLiteral("activeLight"), kWindowsColorSet.activeLight); + map.insert(QStringLiteral("activeDark"), kWindowsColorSet.activeDark); + map.insert(QStringLiteral("inactiveLight"), kWindowsColorSet.inactiveLight); + map.insert(QStringLiteral("inactiveDark"), kWindowsColorSet.inactiveDark); return; } - case DrawBordersHook: { + case DrawWindows10BorderHook: { auto args = static_cast<void **>(data); auto &painter = *static_cast<QPainter *>(args[0]); const auto &rect = *static_cast<const QRect *>(args[1]); const auto ®ion = *static_cast<const QRegion *>(args[2]); - const auto hwnd = reinterpret_cast<HWND>(m_windowHandle->winId()); + const auto hwnd = reinterpret_cast<HWND>(windowId); QPen pen; - const auto borderThickness = int(QHighDpi::fromNativePixels( - getWindowFrameBorderThickness(hwnd), m_windowHandle)); - pen.setWidth(borderThickness * 2); - const bool active = m_delegate->isWindowActive(m_host); - const bool dark = isDarkThemeActive() && isDarkWindowFrameEnabled(hwnd); + pen.setWidth(getWindowFrameBorderThickness(hwnd) * 2); - if (active) { + const bool dark = isDarkThemeActive() && isDarkWindowFrameEnabled(hwnd); + if (m_delegate->isWindowActive(m_host)) { if (isWindowFrameBorderColorized()) { pen.setColor(getAccentColor()); } else { @@ -868,52 +958,71 @@ } painter.save(); - // ### TODO: do we need to enable or disable it? + // We needs anti-aliasing to give us better result. painter.setRenderHint(QPainter::Antialiasing); painter.setPen(pen); painter.drawLine(QLine{ - QPoint{0, 0}, - QPoint{rect.width(), 0} + QPoint{0, 0}, + QPoint{m_windowHandle->width(), 0} }); painter.restore(); return; } - default: { - // unreachable + default: break; - } } AbstractWindowContext::virtual_hook(id, data); } - bool Win32WindowContext::setupHost() { + bool Win32WindowContext::needBorderPainter() const { + return isWin10OrGreater() && !isWin11OrGreater(); + } + + int Win32WindowContext::borderThickness() const { + return getWindowFrameBorderThickness(reinterpret_cast<HWND>(windowId)); + } + + void Win32WindowContext::winIdChanged(QWindow *oldWindow, bool isDestroyed) { + Q_UNUSED(isDestroyed) + + // If the original window id is valid, remove all resources related + if (windowId) { + if (isDestroyed) { + removeManagedWindow(reinterpret_cast<HWND>(windowId)); + } else { + removeManagedWindow<false>(reinterpret_cast<HWND>(windowId)); + } + windowId = 0; + } + + if (!m_windowHandle) { + return; + } + // Install window hook auto winId = m_windowHandle->winId(); auto hWnd = reinterpret_cast<HWND>(winId); - // Inform Qt we want and have set custom margins - updateInternalWindowFrameMargins(hWnd, m_windowHandle); - - // Store original window proc - if (!g_qtWindowProc) { - g_qtWindowProc = reinterpret_cast<WNDPROC>(::GetWindowLongPtrW(hWnd, GWLP_WNDPROC)); +#if QT_VERSION < QT_VERSION_CHECK(6, 5, 0) + for (const auto attr : { + _DWMWA_USE_IMMERSIVE_DARK_MODE_BEFORE_20H1, + _DWMWA_USE_IMMERSIVE_DARK_MODE, + }) { + const BOOL enable = TRUE; + DynamicApis::instance().pDwmSetWindowAttribute(hWnd, attr, &enable, sizeof(enable)); } +#endif - // Hook window proc - ::SetWindowLongPtrW(hWnd, GWLP_WNDPROC, reinterpret_cast<LONG_PTR>(QWKHookedWndProc)); + // Inform Qt we want and have set custom margins + updateInternalWindowFrameMargins(hWnd, m_windowHandle); // TODO: Restore? - // Install global native event filter - WindowsNativeEventFilter::install(); + // Add managed window + addManagedWindow(hWnd, this); - // Cache window ID + // Cache win id windowId = winId; - - // Save window handle mapping - g_wndProcHash->insert(hWnd, this); - - return true; } bool Win32WindowContext::windowProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam, @@ -953,12 +1062,25 @@ return true; } + // Forward to native event filter subscribers + if (!m_nativeEventFilters.isEmpty()) { + MSG msg; + msg.hwnd = hWnd; + msg.message = message; + msg.wParam = wParam; + msg.lParam = lParam; + QT_NATIVE_EVENT_RESULT_TYPE res = 0; + if (dispatch(QByteArrayLiteral("windows_generic_MSG"), &msg, &res)) { + *result = LRESULT(res); + return true; + } + } return false; // Not handled } QWK_USED static constexpr const struct { - const WPARAM wParam = 0xF1C9ADD4; - const LPARAM lParam = 0xAFB6F4C6; + const WPARAM wParam = MAKEWPARAM(44500, 61897); + const LPARAM lParam = MAKELPARAM(62662, 44982); // Not used. Reserve for future use. } kMessageTag; static inline quint64 getKeyState() { @@ -1161,7 +1283,54 @@ const WindowPart currentWindowPart = lastHitTestResult; if (message == WM_NCMOUSEMOVE) { if (currentWindowPart != WindowPart::ChromeButton) { - m_delegate->resetQtGrabbedControl(); + // 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, WM_NCMOUSELEAVE); @@ -1223,7 +1392,9 @@ // 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. - m_delegate->resetQtGrabbedControl(); + + // Why do we need to call this function here? + m_delegate->resetQtGrabbedControl(m_host); } } break; @@ -1243,9 +1414,9 @@ // If wParam is TRUE, the window is being shown. // If lParam is zero, the message was sent because of a call to the ShowWindow // function. - if (wParam && lParam == 0) { + if (wParam && !lParam) { centered = true; - moveToDesktopCenter(hWnd); + moveWindowToDesktopCenter(hWnd); } } break; @@ -1332,7 +1503,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)); // }); @@ -1455,7 +1625,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 @@ -1548,9 +1718,10 @@ // the client area as a whole will shift to the left, which looks very abnormal if // we don't repaint it. This exception disappears if we add SWP_NOCOPYBITS flag. // But I don't know what caused the problem, or why this would solve it. + static constexpr const auto kBadWindowPosFlag = + SWP_NOSIZE | SWP_NOMOVE | SWP_NOZORDER | SWP_NOACTIVATE | SWP_FRAMECHANGED; const auto windowPos = reinterpret_cast<LPWINDOWPOS>(lParam); - if (windowPos->flags == - (SWP_NOSIZE | SWP_NOMOVE | SWP_NOZORDER | SWP_NOACTIVATE | SWP_FRAMECHANGED)) { + if (windowPos->flags == kBadWindowPosFlag) { windowPos->flags |= SWP_NOCOPYBITS; } break; -- Gitblit v1.9.1