From fd8aca4a20f52f696aa239ead1baa20cea5879f6 Mon Sep 17 00:00:00 2001
From: SineStriker <55847490+SineStriker@users.noreply.github.com>
Date: 周一, 11 12月 2023 14:58:25 +0800
Subject: [PATCH] Merge pull request #2 from stdware/refactor
---
src/widgets/widgetwindowagent.cpp | 22 ++++++++++++----------
1 files changed, 12 insertions(+), 10 deletions(-)
diff --git a/src/widgets/widgetwindowagent.cpp b/src/widgets/widgetwindowagent.cpp
index 6dd9015..f7d016e 100644
--- a/src/widgets/widgetwindowagent.cpp
+++ b/src/widgets/widgetwindowagent.cpp
@@ -32,7 +32,9 @@
return false;
}
- std::ignore = w->winId(); // Make sure the window handle is created
+ w->setAttribute(Qt::WA_DontCreateNativeAncestors);
+ w->setAttribute(Qt::WA_NativeWindow);
+
if (!d->setup(w, new WidgetItemDelegate())) {
return false;
}
@@ -40,12 +42,12 @@
return true;
}
- QWidget *WidgetWindowAgent::titleBar() const {
+ const QWidget *WidgetWindowAgent::titleBar() const {
Q_D(const WidgetWindowAgent);
- return static_cast<QWidget *>(d->context->titleBar());
+ return static_cast<const QWidget *>(d->context->titleBar());
}
- void WidgetWindowAgent::setTitleBar(QWidget *w) {
+ void WidgetWindowAgent::setTitleBar(const QWidget *w) {
Q_D(WidgetWindowAgent);
if (!d->context->setTitleBar(w)) {
return;
@@ -53,12 +55,12 @@
Q_EMIT titleBarWidgetChanged(w);
}
- QWidget *WidgetWindowAgent::systemButton(SystemButton button) const {
+ const QWidget *WidgetWindowAgent::systemButton(SystemButton button) const {
Q_D(const WidgetWindowAgent);
- return static_cast<QWidget *>(d->context->systemButton(button));
+ return static_cast<const QWidget *>(d->context->systemButton(button));
}
- void WidgetWindowAgent::setSystemButton(SystemButton button, QWidget *w) {
+ void WidgetWindowAgent::setSystemButton(SystemButton button, const QWidget *w) {
Q_D(WidgetWindowAgent);
if (!d->context->setSystemButton(button, w)) {
return;
@@ -66,12 +68,12 @@
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);
}
@@ -82,7 +84,7 @@
}
WidgetWindowAgent::WidgetWindowAgent(WidgetWindowAgentPrivate &d, QObject *parent)
- : CoreWindowAgent(d, parent) {
+ : WindowAgentBase(d, parent) {
d.init();
}
}
--
Gitblit v1.9.1