From a51b5688e1c33d3ce96b48c869603b00f908f513 Mon Sep 17 00:00:00 2001
From: Sine Striker <trueful@163.com>
Date: 周三, 13 12月 2023 04:16:37 +0800
Subject: [PATCH] Make better code structure for border handlers
---
src/widgets/widgetwindowagent.cpp | 82 +++++++++++++++++++++++------------------
1 files changed, 46 insertions(+), 36 deletions(-)
diff --git a/src/widgets/widgetwindowagent.cpp b/src/widgets/widgetwindowagent.cpp
index 9726e4b..ff76aef 100644
--- a/src/widgets/widgetwindowagent.cpp
+++ b/src/widgets/widgetwindowagent.cpp
@@ -1,6 +1,10 @@
#include "widgetwindowagent.h"
#include "widgetwindowagent_p.h"
+#include <QtGui/QtEvents>
+#include <QtGui/QPainter>
+#include <QtCore/QDebug>
+
#include "widgetitemdelegate_p.h"
namespace QWK {
@@ -28,61 +32,67 @@
}
Q_D(WidgetWindowAgent);
- if (d->host) {
+ if (d->hostWidget) {
return false;
}
- std::ignore = w->winId(); // Make sure the window handle is created
- if (!d->setup(w->windowHandle(), new WidgetItemDelegate())) {
- return true;
+ w->setAttribute(Qt::WA_DontCreateNativeAncestors);
+ w->setAttribute(Qt::WA_NativeWindow);
+
+ if (!d->setup(w, new WidgetItemDelegate())) {
+ return false;
}
- d->host = w;
+ d->hostWidget = w;
+
+#ifdef Q_OS_WINDOWS
+ d->setupWindows10BorderWorkaround();
+#endif
return true;
- }
-
- bool WidgetWindowAgent::isHitTestVisible(QWidget *w) const {
- Q_D(const WidgetWindowAgent);
- return d->m_eventHandler->isHitTestVisible(w);
- }
-
- void WidgetWindowAgent::setHitTestVisible(QWidget *w, bool visible) {
- Q_D(WidgetWindowAgent);
- d->m_eventHandler->setHitTestVisible(w, visible);
- }
-
- void WidgetWindowAgent::setHitTestVisible(const QRect &rect, bool visible) {
- Q_D(WidgetWindowAgent);
- d->m_eventHandler->setHitTestVisible(rect, visible);
- }
-
- QWidget *WidgetWindowAgent::systemButton(CoreWindowAgent::SystemButton button) const {
- Q_D(const WidgetWindowAgent);
- return static_cast<QWidget *>(d->m_eventHandler->systemButton(button));
- }
-
- void WidgetWindowAgent::setSystemButton(CoreWindowAgent::SystemButton button, QWidget *w) {
- Q_D(WidgetWindowAgent);
- if (!d->m_eventHandler->setSystemButton(button, w)) {
- return;
- }
- Q_EMIT systemButtonChanged(button, w);
}
QWidget *WidgetWindowAgent::titleBar() const {
Q_D(const WidgetWindowAgent);
- return static_cast<QWidget *>(d->m_eventHandler->titleBar());
+ return static_cast<QWidget *>(d->context->titleBar());
}
void WidgetWindowAgent::setTitleBar(QWidget *w) {
Q_D(WidgetWindowAgent);
- if (!d->m_eventHandler->setTitleBar(w)) {
+ if (!d->context->setTitleBar(w)) {
return;
}
Q_EMIT titleBarWidgetChanged(w);
}
+ QWidget *WidgetWindowAgent::systemButton(SystemButton button) const {
+ Q_D(const WidgetWindowAgent);
+ return static_cast<QWidget *>(d->context->systemButton(button));
+ }
+
+ void WidgetWindowAgent::setSystemButton(SystemButton button, QWidget *w) {
+ Q_D(WidgetWindowAgent);
+ if (!d->context->setSystemButton(button, w)) {
+ return;
+ }
+ Q_EMIT systemButtonChanged(button, w);
+ }
+
+ bool WidgetWindowAgent::isHitTestVisible(const QWidget *w) const {
+ Q_D(const WidgetWindowAgent);
+ return d->context->isHitTestVisible(w);
+ }
+
+ 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