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/widgets/widgetwindowagent.cpp | 45 +++++++++++++++++++--------------------------
1 files changed, 19 insertions(+), 26 deletions(-)
diff --git a/src/widgets/widgetwindowagent.cpp b/src/widgets/widgetwindowagent.cpp
index b183951..d74c5f6 100644
--- a/src/widgets/widgetwindowagent.cpp
+++ b/src/widgets/widgetwindowagent.cpp
@@ -1,30 +1,26 @@
#include "widgetwindowagent.h"
#include "widgetwindowagent_p.h"
+#include <QtGui/QtEvents>
+#include <QtGui/QPainter>
+#include <QtCore/QDebug>
+
#include "widgetitemdelegate_p.h"
-#include "widgetwindowcontext_p.h"
namespace QWK {
- WidgetWindowAgentPrivate::WidgetWindowAgentPrivate() {
- }
+ WidgetWindowAgentPrivate::WidgetWindowAgentPrivate() = default;
- WidgetWindowAgentPrivate::~WidgetWindowAgentPrivate() {
- }
+ WidgetWindowAgentPrivate::~WidgetWindowAgentPrivate() = default;
void WidgetWindowAgentPrivate::init() {
- }
-
- AbstractWindowContext *WidgetWindowAgentPrivate::createContext() const {
- return new WidgetWindowContext();
}
WidgetWindowAgent::WidgetWindowAgent(QObject *parent)
: WidgetWindowAgent(*new WidgetWindowAgentPrivate(), parent) {
}
- WidgetWindowAgent::~WidgetWindowAgent() {
- }
+ WidgetWindowAgent::~WidgetWindowAgent() = default;
bool WidgetWindowAgent::setup(QWidget *w) {
Q_ASSERT(w);
@@ -40,19 +36,21 @@
w->setAttribute(Qt::WA_DontCreateNativeAncestors);
w->setAttribute(Qt::WA_NativeWindow);
- if (!d->setup(w, new WidgetItemDelegate())) {
- return false;
- }
+ d->setup(w, new WidgetItemDelegate());
d->hostWidget = w;
+
+#if defined(Q_OS_WINDOWS) && QWINDOWKIT_CONFIG(ENABLE_WINDOWS_SYSTEM_BORDERS)
+ d->setupWindows10BorderWorkaround();
+#endif
return true;
}
- const QWidget *WidgetWindowAgent::titleBar() const {
+ QWidget *WidgetWindowAgent::titleBar() const {
Q_D(const WidgetWindowAgent);
- return static_cast<const QWidget *>(d->context->titleBar());
+ return static_cast<QWidget *>(d->context->titleBar());
}
- void WidgetWindowAgent::setTitleBar(const QWidget *w) {
+ void WidgetWindowAgent::setTitleBar(QWidget *w) {
Q_D(WidgetWindowAgent);
if (!d->context->setTitleBar(w)) {
return;
@@ -60,12 +58,12 @@
Q_EMIT titleBarWidgetChanged(w);
}
- const QWidget *WidgetWindowAgent::systemButton(SystemButton button) const {
+ QWidget *WidgetWindowAgent::systemButton(SystemButton button) const {
Q_D(const WidgetWindowAgent);
- return static_cast<const QWidget *>(d->context->systemButton(button));
+ return static_cast<QWidget *>(d->context->systemButton(button));
}
- void WidgetWindowAgent::setSystemButton(SystemButton button, const QWidget *w) {
+ void WidgetWindowAgent::setSystemButton(SystemButton button, QWidget *w) {
Q_D(WidgetWindowAgent);
if (!d->context->setSystemButton(button, w)) {
return;
@@ -83,13 +81,8 @@
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