From f3721da17996168489778327459084dd227690d6 Mon Sep 17 00:00:00 2001
From: Sine Striker <trueful@163.com>
Date: 周六, 23 12月 2023 23:29:39 +0800
Subject: [PATCH] Adjust paint event handler
---
src/widgets/widgetwindowagent_win.cpp | 63 +++++++++++++++++++++++--------
1 files changed, 47 insertions(+), 16 deletions(-)
diff --git a/src/widgets/widgetwindowagent_win.cpp b/src/widgets/widgetwindowagent_win.cpp
index 58d52dd..7901bac 100644
--- a/src/widgets/widgetwindowagent_win.cpp
+++ b/src/widgets/widgetwindowagent_win.cpp
@@ -2,19 +2,23 @@
#include <QtGui/QPainter>
-#include <QWKCore/private/eventobserver_p.h>
+#include <QWKCore/qwindowkit_windows.h>
+#include <QWKCore/qwkconfig.h>
+#include <QWKCore/private/nativeeventfilter_p.h>
namespace QWK {
- class WidgetBorderHandler : public QObject, public EventObserver {
- Q_OBJECT
+#if QWINDOWKIT_CONFIG(ENABLE_WINDOWS_SYSTEM_BORDER)
+
+ class WidgetBorderHandler;
+
+ class WidgetBorderHandler : public QObject, public NativeEventFilter {
public:
- explicit WidgetBorderHandler(QWidget *widget, AbstractWindowContext *ctx,
- QObject *parent = nullptr)
- : QObject(parent), widget(widget), ctx(ctx) {
+ explicit WidgetBorderHandler(QWidget *widget, AbstractWindowContext *ctx)
+ : QObject(ctx), widget(widget), ctx(ctx) {
widget->installEventFilter(this);
- ctx->addObserver(this);
+ ctx->installNativeEventFilter(this);
updateGeometry();
}
@@ -32,15 +36,29 @@
}
protected:
- bool observe(QEvent *event) override {
- switch (event->type()) {
- case QEvent::UpdateRequest: {
+ bool nativeEventFilter(const QByteArray &eventType, void *message,
+ QT_NATIVE_EVENT_RESULT_TYPE *result) override {
+ Q_UNUSED(eventType)
+ const auto msg = static_cast<const MSG *>(message);
+ switch (msg->message) {
+ case WM_DPICHANGED: {
+ updateGeometry();
+ break;
+ }
+
+ case WM_THEMECHANGED:
+ case WM_SYSCOLORCHANGE:
+ case WM_DWMCOLORIZATIONCOLORCHANGED: {
widget->update();
break;
}
- case QEvent::ScreenChangeInternal: {
- updateGeometry();
+ case WM_SETTINGCHANGE: {
+ if (!msg->wParam && msg->lParam &&
+ std::wcscmp(reinterpret_cast<LPCWSTR>(msg->lParam), L"ImmersiveColorSet") ==
+ 0) {
+ widget->update();
+ }
break;
}
@@ -51,11 +69,23 @@
}
bool eventFilter(QObject *obj, QEvent *event) override {
+ Q_UNUSED(obj)
switch (event->type()) {
case QEvent::Paint: {
- if (widget->windowState() & (Qt::WindowMaximized | Qt::WindowFullScreen))
+ if (widget->windowState() &
+ (Qt::WindowMinimized | Qt::WindowMaximized | Qt::WindowFullScreen))
break;
+ // Friend class helping to call `event`
+ class HackedWidget : public QWidget {
+ public:
+ friend class WidgetBorderHandler;
+ };
+
+ // Let the widget paint first
+ static_cast<HackedWidget *>(widget)->event(event);
+
+ // Draw border
auto paintEvent = static_cast<QPaintEvent *>(event);
auto rect = paintEvent->rect();
auto region = paintEvent->region();
@@ -90,15 +120,16 @@
QWidget *widget;
AbstractWindowContext *ctx;
};
+#endif
void WidgetWindowAgentPrivate::setupWindows10BorderWorkaround() {
+#if QWINDOWKIT_CONFIG(ENABLE_WINDOWS_SYSTEM_BORDER)
// Install painting hook
auto ctx = context.get();
if (ctx->property("needBorderPainter").toBool()) {
- std::ignore = new WidgetBorderHandler(hostWidget, ctx, ctx);
+ std::ignore = new WidgetBorderHandler(hostWidget, ctx);
}
+#endif
}
}
-
-#include "widgetwindowagent_win.moc"
\ No newline at end of file
--
Gitblit v1.9.1