From e18723d66cf470720c29a9d2848150ea1cbe5450 Mon Sep 17 00:00:00 2001 From: Sine Striker <trueful@163.com> Date: ćšć, 14 12æ 2023 04:49:35 +0800 Subject: [PATCH] Add example resources --- src/widgets/widgetwindowagent_win.cpp | 40 +++++++++++++++++++++++++++------------- 1 files changed, 27 insertions(+), 13 deletions(-) diff --git a/src/widgets/widgetwindowagent_win.cpp b/src/widgets/widgetwindowagent_win.cpp index 58d52dd..ccac368 100644 --- a/src/widgets/widgetwindowagent_win.cpp +++ b/src/widgets/widgetwindowagent_win.cpp @@ -2,19 +2,19 @@ #include <QtGui/QPainter> -#include <QWKCore/private/eventobserver_p.h> +#include <QWKCore/qwindowkit_windows.h> +#include <QWKCore/private/nativeeventfilter_p.h> namespace QWK { - class WidgetBorderHandler : public QObject, public EventObserver { + class WidgetBorderHandler : public QObject, public NativeEventFilter { Q_OBJECT 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 +32,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) + auto msg = reinterpret_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; } @@ -67,7 +81,7 @@ ®ion, }; ctx->virtual_hook(AbstractWindowContext::DrawWindows10BorderHook, args); - return true; + break; } case QEvent::WindowStateChange: { @@ -95,7 +109,7 @@ // 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); } } -- Gitblit v1.9.1