From d3d7430ec9afb94abaf78fa2c9edd9d9f946881c Mon Sep 17 00:00:00 2001
From: Sine Striker <trueful@163.com>
Date: 周一, 18 12月 2023 01:29:07 +0800
Subject: [PATCH] Add QtContext WinIdChange workaround
---
src/widgets/widgetwindowagent.cpp | 74 +++++++-----------------------------
1 files changed, 15 insertions(+), 59 deletions(-)
diff --git a/src/widgets/widgetwindowagent.cpp b/src/widgets/widgetwindowagent.cpp
index e869010..a15a7ed 100644
--- a/src/widgets/widgetwindowagent.cpp
+++ b/src/widgets/widgetwindowagent.cpp
@@ -5,64 +5,34 @@
#include <QtGui/QPainter>
#include <QtCore/QDebug>
-#ifdef Q_OS_WINDOWS
-# include <QWKCore/private/win10borderhandler_p.h>
-#endif
-
#include "widgetitemdelegate_p.h"
namespace QWK {
-#ifdef Q_OS_WINDOWS
- class WidgetBorderHandler : public QObject, public Win10BorderHandler {
+ class WidgetWinIdChangeEventFilter : public QObject {
public:
- explicit WidgetBorderHandler(QWidget *widget)
- : Win10BorderHandler(widget->windowHandle()), widget(widget) {
+ explicit WidgetWinIdChangeEventFilter(QWidget *widget, AbstractWindowContext *ctx)
+ : QObject(ctx), widget(widget), ctx(ctx) {
widget->installEventFilter(this);
- }
-
- void updateGeometry() override {
- if (widget->windowState() & (Qt::WindowMaximized | Qt::WindowFullScreen)) {
- widget->setContentsMargins({});
- } else {
- widget->setContentsMargins({0, int(m_borderThickness), 0, 0});
- }
- }
-
- void requestUpdate() override {
- widget->update();
- }
-
- bool isActive() const override {
- return widget->isActiveWindow();
}
protected:
bool eventFilter(QObject *obj, QEvent *event) override {
- switch (event->type()) {
- case QEvent::Paint: {
- if (widget->windowState() & (Qt::WindowMaximized | Qt::WindowFullScreen))
- break;
- auto paintEvent = static_cast<QPaintEvent *>(event);
- QPainter painter(widget);
- paintBorder(painter, paintEvent->rect(), paintEvent->region());
- return true;
- }
- default:
- break;
+ Q_UNUSED(obj)
+ if (event->type() == QEvent::WinIdChange) {
+ ctx->notifyWinIdChange();
}
return false;
}
+ protected:
QWidget *widget;
+ AbstractWindowContext *ctx;
};
-#endif
- WidgetWindowAgentPrivate::WidgetWindowAgentPrivate() {
- }
+ WidgetWindowAgentPrivate::WidgetWindowAgentPrivate() = default;
- WidgetWindowAgentPrivate::~WidgetWindowAgentPrivate() {
- }
+ WidgetWindowAgentPrivate::~WidgetWindowAgentPrivate() = default;
void WidgetWindowAgentPrivate::init() {
}
@@ -71,8 +41,7 @@
: WidgetWindowAgent(*new WidgetWindowAgentPrivate(), parent) {
}
- WidgetWindowAgent::~WidgetWindowAgent() {
- }
+ WidgetWindowAgent::~WidgetWindowAgent() = default;
bool WidgetWindowAgent::setup(QWidget *w) {
Q_ASSERT(w);
@@ -88,22 +57,14 @@
w->setAttribute(Qt::WA_DontCreateNativeAncestors);
w->setAttribute(Qt::WA_NativeWindow);
- if (!d->setup(w, new WidgetItemDelegate())) {
- return false;
- }
+ d->setup(w, new WidgetItemDelegate());
d->hostWidget = w;
#ifdef Q_OS_WINDOWS
- // Install painting hook
- if (bool needPaintBorder;
- QMetaObject::invokeMethod(d->context.get(), "needWin10BorderHandler",
- Qt::DirectConnection, Q_RETURN_ARG(bool, needPaintBorder)),
- needPaintBorder) {
- QMetaObject::invokeMethod(d->context.get(), "setWin10BorderHandler",
- Qt::DirectConnection,
- Q_ARG(Win10BorderHandler *, new WidgetBorderHandler(w)));
- }
+ d->setupWindows10BorderWorkaround();
#endif
+ std::ignore = new WidgetWinIdChangeEventFilter(w, d->context.get());
+
return true;
}
@@ -141,11 +102,6 @@
void WidgetWindowAgent::setHitTestVisible(const QWidget *w, bool visible) {
Q_D(WidgetWindowAgent);
d->context->setHitTestVisible(w, visible);
- }
-
- void WidgetWindowAgent::setHitTestVisible(const QRect &rect, bool visible) {
- Q_D(WidgetWindowAgent);
- d->context->setHitTestVisible(rect, visible);
}
WidgetWindowAgent::WidgetWindowAgent(WidgetWindowAgentPrivate &d, QObject *parent)
--
Gitblit v1.9.1