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/quick/quickwindowagent.cpp | 72 +++++++++++++++++++----------------
1 files changed, 39 insertions(+), 33 deletions(-)
diff --git a/src/quick/quickwindowagent.cpp b/src/quick/quickwindowagent.cpp
index aae49f7..9422f65 100644
--- a/src/quick/quickwindowagent.cpp
+++ b/src/quick/quickwindowagent.cpp
@@ -1,9 +1,10 @@
#include "quickwindowagent.h"
#include "quickwindowagent_p.h"
-#include "quickitemdelegate_p.h"
-
#include <QtQuick/QQuickWindow>
+#include <QtQuick/private/qquickanchors_p.h>
+
+#include "quickitemdelegate_p.h"
namespace QWK {
@@ -35,38 +36,14 @@
}
if (!d->setup(window, new QuickItemDelegate())) {
- return true;
+ return false;
}
d->hostWindow = window;
+
+#ifdef Q_OS_WINDOWS
+ d->setupWindows10BorderWorkaround();
+#endif
return true;
- }
-
- bool QuickWindowAgent::isHitTestVisible(QQuickItem *item) const {
- Q_D(const QuickWindowAgent);
- return d->context->isHitTestVisible(item);
- }
-
- void QuickWindowAgent::setHitTestVisible(QQuickItem *item, bool visible) {
- Q_D(QuickWindowAgent);
- d->context->setHitTestVisible(item, visible);
- }
-
- void QuickWindowAgent::setHitTestVisible(const QRect &rect, bool visible) {
- Q_D(QuickWindowAgent);
- d->context->setHitTestVisible(rect, visible);
- }
-
- QQuickItem *QuickWindowAgent::systemButton(SystemButton button) const {
- Q_D(const QuickWindowAgent);
- return static_cast<QQuickItem *>(d->context->systemButton(button));
- }
-
- void QuickWindowAgent::setSystemButton(SystemButton button, QQuickItem *item) {
- Q_D(QuickWindowAgent);
- if (!d->context->setSystemButton(button, item)) {
- return;
- }
- Q_EMIT systemButtonChanged(button, item);
}
QQuickItem *QuickWindowAgent::titleBar() const {
@@ -82,8 +59,37 @@
Q_EMIT titleBarWidgetChanged(item);
}
+ QQuickItem *QuickWindowAgent::systemButton(SystemButton button) const {
+ Q_D(const QuickWindowAgent);
+ return static_cast<QQuickItem *>(d->context->systemButton(button));
+ }
+
+ void QuickWindowAgent::setSystemButton(SystemButton button, QQuickItem *item) {
+ Q_D(QuickWindowAgent);
+ if (!d->context->setSystemButton(button, item)) {
+ return;
+ }
+ Q_EMIT systemButtonChanged(button, item);
+ }
+
+ bool QuickWindowAgent::isHitTestVisible(const QQuickItem *item) const {
+ Q_D(const QuickWindowAgent);
+ return d->context->isHitTestVisible(item);
+ }
+
+ void QuickWindowAgent::setHitTestVisible_item(const QQuickItem *item, bool visible) {
+ Q_D(QuickWindowAgent);
+ d->context->setHitTestVisible(item, visible);
+ }
+
+ void QuickWindowAgent::setHitTestVisible_rect(const QRect &rect, bool visible) {
+ Q_D(QuickWindowAgent);
+ d->context->setHitTestVisible(rect, visible);
+ }
+
QuickWindowAgent::QuickWindowAgent(QuickWindowAgentPrivate &d, QObject *parent)
- : CoreWindowAgent(d, parent) {
+ : WindowAgentBase(d, parent) {
d.init();
}
-}
+
+}
\ No newline at end of file
--
Gitblit v1.9.1