From 88b5b56b6a67d93208eae3980af2f30da09dd8ae Mon Sep 17 00:00:00 2001
From: SineStriker <trueful@163.com>
Date: 周三, 27 12月 2023 01:10:59 +0800
Subject: [PATCH] Add notification observer on Mac
---
src/quick/quickwindowagent.cpp | 78 ++++++++++++++++++--------------------
1 files changed, 37 insertions(+), 41 deletions(-)
diff --git a/src/quick/quickwindowagent.cpp b/src/quick/quickwindowagent.cpp
index aae49f7..0731836 100644
--- a/src/quick/quickwindowagent.cpp
+++ b/src/quick/quickwindowagent.cpp
@@ -1,17 +1,16 @@
#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 {
- QuickWindowAgentPrivate::QuickWindowAgentPrivate() {
- }
+ QuickWindowAgentPrivate::QuickWindowAgentPrivate() = default;
- QuickWindowAgentPrivate::~QuickWindowAgentPrivate() {
- }
+ QuickWindowAgentPrivate::~QuickWindowAgentPrivate() = default;
void QuickWindowAgentPrivate::init() {
}
@@ -20,8 +19,7 @@
: QuickWindowAgent(*new QuickWindowAgentPrivate(), parent) {
}
- QuickWindowAgent::~QuickWindowAgent() {
- }
+ QuickWindowAgent::~QuickWindowAgent() = default;
bool QuickWindowAgent::setup(QQuickWindow *window) {
Q_ASSERT(window);
@@ -34,39 +32,13 @@
return false;
}
- if (!d->setup(window, new QuickItemDelegate())) {
- return true;
- }
+ d->setup(window, new QuickItemDelegate());
d->hostWindow = window;
+
+#if defined(Q_OS_WINDOWS) && QWINDOWKIT_CONFIG(ENABLE_WINDOWS_SYSTEM_BORDERS)
+ 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 +54,32 @@
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(const QQuickItem *item, bool visible) {
+ Q_D(QuickWindowAgent);
+ d->context->setHitTestVisible(item, 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