From e9f790d3533ebaee1f782e91b6e13b2c6375c86a Mon Sep 17 00:00:00 2001
From: SineStriker <55847490+SineStriker@users.noreply.github.com>
Date: 周二, 11 2月 2025 23:06:01 +0800
Subject: [PATCH] AWC: fix window attribute handler
---
src/widgets/widgetwindowagent.cpp | 16 ++++++++++++++--
1 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/src/widgets/widgetwindowagent.cpp b/src/widgets/widgetwindowagent.cpp
index e2b6db1..ca5afa4 100644
--- a/src/widgets/widgetwindowagent.cpp
+++ b/src/widgets/widgetwindowagent.cpp
@@ -1,3 +1,7 @@
+// Copyright (C) 2023-2024 Stdware Collections (https://www.github.com/stdware)
+// Copyright (C) 2021-2023 wangwenx190 (Yuhang Zhao)
+// SPDX-License-Identifier: Apache-2.0
+
#include "widgetwindowagent.h"
#include "widgetwindowagent_p.h"
@@ -51,8 +55,13 @@
return false;
}
+ // Qt will create invisible native window container for native QWidget
+ // without this attribute, and this behavior will break QWK functionality.
+ // So far enabling this attribute is a must for QWK users.
w->setAttribute(Qt::WA_DontCreateNativeAncestors);
- w->setAttribute(Qt::WA_NativeWindow);
+ // Make sure the native window handle is actually created before we apply
+ // various hooks.
+ w->setAttribute(Qt::WA_NativeWindow); // ### FIXME: Remove
d->setup(w, new WidgetItemDelegate());
d->hostWidget = w;
@@ -80,6 +89,9 @@
if (!d->context->setTitleBar(w)) {
return;
}
+#ifdef Q_OS_MAC
+ setSystemButtonArea(nullptr);
+#endif
Q_EMIT titleBarChanged(w);
}
@@ -116,7 +128,7 @@
You're supposed to make sure that the specified widget \a w is a child or descendant
of the title bar widget.
*/
- void WidgetWindowAgent::setHitTestVisible(const QWidget *w, bool visible) {
+ void WidgetWindowAgent::setHitTestVisible(QWidget *w, bool visible) {
Q_D(WidgetWindowAgent);
d->context->setHitTestVisible(w, visible);
}
--
Gitblit v1.9.1