From 8b72eabae325c34d8eab1544203993015cc91741 Mon Sep 17 00:00:00 2001
From: Sine Striker <trueful@163.com>
Date: 周一, 18 12月 2023 00:54:51 +0800
Subject: [PATCH] Add win32 winIdChange workaround
---
src/widgets/widgetwindowagent.cpp | 59 +++++++++++++++++++++++++++++++++++++++++------------------
1 files changed, 41 insertions(+), 18 deletions(-)
diff --git a/src/widgets/widgetwindowagent.cpp b/src/widgets/widgetwindowagent.cpp
index 73a4334..a15a7ed 100644
--- a/src/widgets/widgetwindowagent.cpp
+++ b/src/widgets/widgetwindowagent.cpp
@@ -1,15 +1,38 @@
#include "widgetwindowagent.h"
#include "widgetwindowagent_p.h"
+#include <QtGui/QtEvents>
+#include <QtGui/QPainter>
+#include <QtCore/QDebug>
+
#include "widgetitemdelegate_p.h"
namespace QWK {
- WidgetWindowAgentPrivate::WidgetWindowAgentPrivate() {
- }
+ class WidgetWinIdChangeEventFilter : public QObject {
+ public:
+ explicit WidgetWinIdChangeEventFilter(QWidget *widget, AbstractWindowContext *ctx)
+ : QObject(ctx), widget(widget), ctx(ctx) {
+ widget->installEventFilter(this);
+ }
- WidgetWindowAgentPrivate::~WidgetWindowAgentPrivate() {
- }
+ protected:
+ bool eventFilter(QObject *obj, QEvent *event) override {
+ Q_UNUSED(obj)
+ if (event->type() == QEvent::WinIdChange) {
+ ctx->notifyWinIdChange();
+ }
+ return false;
+ }
+
+ protected:
+ QWidget *widget;
+ AbstractWindowContext *ctx;
+ };
+
+ WidgetWindowAgentPrivate::WidgetWindowAgentPrivate() = default;
+
+ WidgetWindowAgentPrivate::~WidgetWindowAgentPrivate() = default;
void WidgetWindowAgentPrivate::init() {
}
@@ -18,8 +41,7 @@
: WidgetWindowAgent(*new WidgetWindowAgentPrivate(), parent) {
}
- WidgetWindowAgent::~WidgetWindowAgent() {
- }
+ WidgetWindowAgent::~WidgetWindowAgent() = default;
bool WidgetWindowAgent::setup(QWidget *w) {
Q_ASSERT(w);
@@ -32,11 +54,17 @@
return false;
}
- std::ignore = w->winId(); // Make sure the window handle is created
- if (!d->setup(w->windowHandle(), new WidgetItemDelegate())) {
- return false;
- }
+ w->setAttribute(Qt::WA_DontCreateNativeAncestors);
+ w->setAttribute(Qt::WA_NativeWindow);
+
+ d->setup(w, new WidgetItemDelegate());
d->hostWidget = w;
+
+#ifdef Q_OS_WINDOWS
+ d->setupWindows10BorderWorkaround();
+#endif
+ std::ignore = new WidgetWinIdChangeEventFilter(w, d->context.get());
+
return true;
}
@@ -66,23 +94,18 @@
Q_EMIT systemButtonChanged(button, w);
}
- bool WidgetWindowAgent::isHitTestVisible(QWidget *w) const {
+ bool WidgetWindowAgent::isHitTestVisible(const QWidget *w) const {
Q_D(const WidgetWindowAgent);
return d->context->isHitTestVisible(w);
}
- void WidgetWindowAgent::setHitTestVisible(QWidget *w, bool visible) {
+ 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)
- : CoreWindowAgent(d, parent) {
+ : WindowAgentBase(d, parent) {
d.init();
}
}
--
Gitblit v1.9.1