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 | 61 ++++++++++++++++++++----------
1 files changed, 41 insertions(+), 20 deletions(-)
diff --git a/src/widgets/widgetwindowagent.cpp b/src/widgets/widgetwindowagent.cpp
index f7d016e..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);
@@ -35,19 +57,23 @@
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
+ d->setupWindows10BorderWorkaround();
+#endif
+ std::ignore = new WidgetWinIdChangeEventFilter(w, d->context.get());
+
return true;
}
- const QWidget *WidgetWindowAgent::titleBar() const {
+ QWidget *WidgetWindowAgent::titleBar() const {
Q_D(const WidgetWindowAgent);
- return static_cast<const QWidget *>(d->context->titleBar());
+ return static_cast<QWidget *>(d->context->titleBar());
}
- void WidgetWindowAgent::setTitleBar(const QWidget *w) {
+ void WidgetWindowAgent::setTitleBar(QWidget *w) {
Q_D(WidgetWindowAgent);
if (!d->context->setTitleBar(w)) {
return;
@@ -55,12 +81,12 @@
Q_EMIT titleBarWidgetChanged(w);
}
- const QWidget *WidgetWindowAgent::systemButton(SystemButton button) const {
+ QWidget *WidgetWindowAgent::systemButton(SystemButton button) const {
Q_D(const WidgetWindowAgent);
- return static_cast<const QWidget *>(d->context->systemButton(button));
+ return static_cast<QWidget *>(d->context->systemButton(button));
}
- void WidgetWindowAgent::setSystemButton(SystemButton button, const QWidget *w) {
+ void WidgetWindowAgent::setSystemButton(SystemButton button, QWidget *w) {
Q_D(WidgetWindowAgent);
if (!d->context->setSystemButton(button, w)) {
return;
@@ -76,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