From 28f143c5b3c735faa88f9789743729d8933404be Mon Sep 17 00:00:00 2001
From: Zhao Yuhang <2546789017@qq.com>
Date: 周二, 19 12月 2023 19:40:17 +0800
Subject: [PATCH] add win32 raise window
---
src/widgets/widgetwindowagent.cpp | 35 ++++++++++++++++++++++++-----------
1 files changed, 24 insertions(+), 11 deletions(-)
diff --git a/src/widgets/widgetwindowagent.cpp b/src/widgets/widgetwindowagent.cpp
index 8fa28a7..a15a7ed 100644
--- a/src/widgets/widgetwindowagent.cpp
+++ b/src/widgets/widgetwindowagent.cpp
@@ -9,6 +9,27 @@
namespace QWK {
+ class WidgetWinIdChangeEventFilter : public QObject {
+ public:
+ explicit WidgetWinIdChangeEventFilter(QWidget *widget, AbstractWindowContext *ctx)
+ : QObject(ctx), widget(widget), ctx(ctx) {
+ widget->installEventFilter(this);
+ }
+
+ 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;
@@ -36,14 +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
d->setupWindows10BorderWorkaround();
#endif
+ std::ignore = new WidgetWinIdChangeEventFilter(w, d->context.get());
+
return true;
}
@@ -57,9 +78,6 @@
if (!d->context->setTitleBar(w)) {
return;
}
-#ifdef Q_OS_MACOS
- d->setupMacOSTitleBar(w);
-#endif
Q_EMIT titleBarWidgetChanged(w);
}
@@ -84,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