From dddf96c011723a12b11acc2980c10eb370961021 Mon Sep 17 00:00:00 2001 From: Zhao Yuhang <2546789017@qq.com> Date: 周五, 15 12月 2023 21:35:17 +0800 Subject: [PATCH] add qt impl --- src/widgets/widgetwindowagent_win.cpp | 44 +++++++++++++++++++++++++++++--------------- 1 files changed, 29 insertions(+), 15 deletions(-) diff --git a/src/widgets/widgetwindowagent_win.cpp b/src/widgets/widgetwindowagent_win.cpp index 58d52dd..aa7e9c0 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) + 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; } @@ -53,7 +67,7 @@ bool eventFilter(QObject *obj, QEvent *event) override { switch (event->type()) { case QEvent::Paint: { - if (widget->windowState() & (Qt::WindowMaximized | Qt::WindowFullScreen)) + if (widget->windowState() & (Qt::WindowMinimized | Qt::WindowMaximized | Qt::WindowFullScreen)) break; auto paintEvent = static_cast<QPaintEvent *>(event); @@ -67,7 +81,7 @@ ®ion, }; ctx->virtual_hook(AbstractWindowContext::DrawWindows10BorderHook, args); - return true; + break; } case QEvent::WindowStateChange: { @@ -95,10 +109,10 @@ // 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); } } } -#include "widgetwindowagent_win.moc" \ No newline at end of file +#include "widgetwindowagent_win.moc" -- Gitblit v1.9.1