From 5ee113e2c4f916b1078ace782bb130f5edf64bcf Mon Sep 17 00:00:00 2001
From: Zhao Yuhang <2546789017@qq.com>
Date: ćšć, 14 12æ 2023 20:28:02 +0800
Subject: [PATCH] minor tweaks
---
src/core/contexts/win32windowcontext.cpp | 110 +++++++++++--------------------------------------------
1 files changed, 22 insertions(+), 88 deletions(-)
diff --git a/src/core/contexts/win32windowcontext.cpp b/src/core/contexts/win32windowcontext.cpp
index 7dfd543..161903e 100644
--- a/src/core/contexts/win32windowcontext.cpp
+++ b/src/core/contexts/win32windowcontext.cpp
@@ -27,7 +27,6 @@
#include <dwmapi.h>
#include <timeapi.h>
-#include "nativeeventfilter_p.h"
#include "qwkglobal_p.h"
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
@@ -84,7 +83,7 @@
// ### FIXME: Tell the user to call in the documentation, instead of automatically
// calling it directly.
// ### FIXME FIXME FIXME
- static struct QWK_Hook {
+ static const struct QWK_Hook {
QWK_Hook() {
qApp->setAttribute(Qt::AA_DontCreateNativeWidgetSiblings);
}
@@ -429,8 +428,8 @@
const auto 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);
}
@@ -449,6 +448,9 @@
::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
@@ -635,7 +637,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 {
@@ -841,7 +843,7 @@
}
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);
@@ -850,6 +852,7 @@
QPoint{m_windowHandle->width(), 0}
});
painter.restore();
+ return;
}
default: {
@@ -933,10 +936,19 @@
return true;
}
- if (themeStuffHandler(hWnd, message, wParam, lParam, result)) {
- 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
}
@@ -1227,7 +1239,7 @@
// 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);
}
@@ -1923,82 +1935,4 @@
return false;
}
- bool Win32WindowContext::themeStuffHandler(HWND hWnd, UINT message, WPARAM wParam,
- LPARAM lParam, LRESULT *resul) {
- switch (message) {
- case WM_DPICHANGED: {
- const auto dpiX = UINT(LOWORD(wParam));
- const auto dpiY = UINT(HIWORD(wParam));
-
- QEvent e(QEvent::ScreenChangeInternal);
- dispatch(&e);
- break;
- }
-
- case WM_THEMECHANGED:
- case WM_SYSCOLORCHANGE: {
- QEvent e(QEvent::UpdateLater);
- dispatch(&e);
- break;
- }
-
- case WM_DWMCOLORIZATIONCOLORCHANGED: {
- const QColor color = QColor::fromRgba(wParam);
- const auto blendWithOpacity = *reinterpret_cast<LPBOOL>(lParam);
-
- QEvent e(QEvent::UpdateLater);
- dispatch(&e);
- break;
- }
-
- case WM_SETTINGCHANGE: {
- if (!wParam && lParam &&
- std::wcscmp(reinterpret_cast<LPCWSTR>(lParam), L"ImmersiveColorSet") == 0) {
- const QColor color = getAccentColor();
- }
-
- QEvent e(QEvent::UpdateLater);
- dispatch(&e);
- break;
- }
-
- // case WM_SIZE: {
- // const bool max = wParam == SIZE_MAXIMIZED;
- // const bool min = wParam == SIZE_MINIMIZED;
- // const bool full = isFullScreen(hWnd);
-
- // Qt::WindowStates states{};
- // if (max) {
- // states |= Qt::WindowMaximized;
- // }
- // if (min) {
- // states |= Qt::WindowMinimized;
- // }
- // if (full) {
- // states |= Qt::WindowFullScreen;
- // }
-
- // // QTimer::singleShot(0, this, [this, states] {
- // QWindowStateChangeEvent e(states);
- // dispatch(&e);
- // // });
- // break;
- // }
-
- // case WM_ACTIVATE: {
- // const auto state = LOWORD(wParam);
- // const bool active = state == WA_ACTIVE || state == WA_CLICKACTIVE;
- // Q_UNUSED(state)
-
- // // QTimer::singleShot(0, this, [this, active] {
- // QEvent e(active ? QEvent::WindowActivate : QEvent::WindowDeactivate);
- // dispatch(&e);
- // // });
- // break;
- // }
- default:
- break;
- }
- return false;
- }
}
--
Gitblit v1.9.1