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 | 79 +++------------------------------------
1 files changed, 6 insertions(+), 73 deletions(-)
diff --git a/src/widgets/widgetwindowagent.cpp b/src/widgets/widgetwindowagent.cpp
index e869010..d74c5f6 100644
--- a/src/widgets/widgetwindowagent.cpp
+++ b/src/widgets/widgetwindowagent.cpp
@@ -5,64 +5,13 @@
#include <QtGui/QPainter>
#include <QtCore/QDebug>
-#ifdef Q_OS_WINDOWS
-# include <QWKCore/private/win10borderhandler_p.h>
-#endif
-
#include "widgetitemdelegate_p.h"
namespace QWK {
-#ifdef Q_OS_WINDOWS
- class WidgetBorderHandler : public QObject, public Win10BorderHandler {
- public:
- explicit WidgetBorderHandler(QWidget *widget)
- : Win10BorderHandler(widget->windowHandle()), widget(widget) {
- widget->installEventFilter(this);
- }
+ WidgetWindowAgentPrivate::WidgetWindowAgentPrivate() = default;
- void updateGeometry() override {
- if (widget->windowState() & (Qt::WindowMaximized | Qt::WindowFullScreen)) {
- widget->setContentsMargins({});
- } else {
- widget->setContentsMargins({0, int(m_borderThickness), 0, 0});
- }
- }
-
- void requestUpdate() override {
- widget->update();
- }
-
- bool isActive() const override {
- return widget->isActiveWindow();
- }
-
- protected:
- bool eventFilter(QObject *obj, QEvent *event) override {
- switch (event->type()) {
- case QEvent::Paint: {
- if (widget->windowState() & (Qt::WindowMaximized | Qt::WindowFullScreen))
- break;
- auto paintEvent = static_cast<QPaintEvent *>(event);
- QPainter painter(widget);
- paintBorder(painter, paintEvent->rect(), paintEvent->region());
- return true;
- }
- default:
- break;
- }
- return false;
- }
-
- QWidget *widget;
- };
-#endif
-
- WidgetWindowAgentPrivate::WidgetWindowAgentPrivate() {
- }
-
- WidgetWindowAgentPrivate::~WidgetWindowAgentPrivate() {
- }
+ WidgetWindowAgentPrivate::~WidgetWindowAgentPrivate() = default;
void WidgetWindowAgentPrivate::init() {
}
@@ -71,8 +20,7 @@
: WidgetWindowAgent(*new WidgetWindowAgentPrivate(), parent) {
}
- WidgetWindowAgent::~WidgetWindowAgent() {
- }
+ WidgetWindowAgent::~WidgetWindowAgent() = default;
bool WidgetWindowAgent::setup(QWidget *w) {
Q_ASSERT(w);
@@ -88,21 +36,11 @@
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;
-#ifdef Q_OS_WINDOWS
- // Install painting hook
- if (bool needPaintBorder;
- QMetaObject::invokeMethod(d->context.get(), "needWin10BorderHandler",
- Qt::DirectConnection, Q_RETURN_ARG(bool, needPaintBorder)),
- needPaintBorder) {
- QMetaObject::invokeMethod(d->context.get(), "setWin10BorderHandler",
- Qt::DirectConnection,
- Q_ARG(Win10BorderHandler *, new WidgetBorderHandler(w)));
- }
+#if defined(Q_OS_WINDOWS) && QWINDOWKIT_CONFIG(ENABLE_WINDOWS_SYSTEM_BORDERS)
+ d->setupWindows10BorderWorkaround();
#endif
return true;
}
@@ -141,11 +79,6 @@
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)
--
Gitblit v1.9.1