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_win.cpp | 74 +++++++++++++++++++++++++++++--------
1 files changed, 58 insertions(+), 16 deletions(-)
diff --git a/src/quick/quickwindowagent_win.cpp b/src/quick/quickwindowagent_win.cpp
index 8e57584..61ea0ed 100644
--- a/src/quick/quickwindowagent_win.cpp
+++ b/src/quick/quickwindowagent_win.cpp
@@ -3,24 +3,35 @@
#include <QtQuick/QQuickPaintedItem>
#include <QtQuick/private/qquickitem_p.h>
-#include <QWKCore/private/eventobserver_p.h>
+#include <QWKCore/qwindowkit_windows.h>
namespace QWK {
- class BorderItem : public QQuickPaintedItem, public EventObserver {
- Q_OBJECT
+#if QWINDOWKIT_CONFIG(ENABLE_WINDOWS_SYSTEM_BORDERS)
+ // TODO: Find a way to draw native border
+ // We haven't found a way to place hooks in the Quick program and call the GDI API to draw
+ // the native border area so that we'll use the emulated drawn border for now.
+
+ class BorderItem : public QQuickPaintedItem,
+ public NativeEventFilter,
+ public SharedEventFilter {
public:
explicit BorderItem(QQuickItem *parent, AbstractWindowContext *context);
~BorderItem() override;
- void updateGeometry();
+ inline bool isNormalWindow() const;
+
+ inline void updateGeometry();
public:
void paint(QPainter *painter) override;
void itemChange(ItemChange change, const ItemChangeData &data) override;
protected:
- bool observe(QEvent *event) override;
+ bool nativeEventFilter(const QByteArray &eventType, void *message,
+ QT_NATIVE_EVENT_RESULT_TYPE *result) override;
+
+ bool sharedEventFilter(QObject *obj, QEvent *event) override;
AbstractWindowContext *context;
@@ -30,8 +41,7 @@
BorderItem::BorderItem(QQuickItem *parent, AbstractWindowContext *context)
: QQuickPaintedItem(parent), context(context) {
- setAntialiasing(true); // ### FIXME: do we need to enable or disable this?
- setMipmap(true); // ### FIXME: do we need to enable or disable this?
+ setAntialiasing(true); // We needs anti-aliasing to give us better result.
setFillColor({}); // Will improve the performance a little bit.
setOpaquePainting(true); // Will also improve the performance, we don't draw
// semi-transparent borders of course.
@@ -42,9 +52,11 @@
anchors->setLeft(parentPri->left());
anchors->setRight(parentPri->right());
- setZ(10);
+ setZ(9999); // Make sure our fake border always above everything in the window.
- context->addObserver(this);
+ context->installNativeEventFilter(this);
+ context->installSharedEventFilter(this);
+
connect(window(), &QQuickWindow::activeChanged, this,
&BorderItem::_q_windowActivityChanged);
updateGeometry();
@@ -52,8 +64,14 @@
BorderItem::~BorderItem() = default;
+ bool BorderItem::isNormalWindow() const {
+ return !(context->window()->windowState() &
+ (Qt::WindowMinimized | Qt::WindowMaximized | Qt::WindowFullScreen));
+ }
+
void BorderItem::updateGeometry() {
- setHeight(context->property("borderThickness").toInt());
+ setHeight(context->windowAttribute(QStringLiteral("border-thickness")).toInt());
+ setVisible(isNormalWindow());
}
void BorderItem::paint(QPainter *painter) {
@@ -80,13 +98,38 @@
}
}
- bool BorderItem::observe(QEvent *event) {
- switch (event->type()) {
- case QEvent::UpdateRequest: {
+ bool BorderItem::nativeEventFilter(const QByteArray &eventType, void *message,
+ QT_NATIVE_EVENT_RESULT_TYPE *result) {
+ Q_UNUSED(eventType)
+ const auto msg = static_cast<const MSG *>(message);
+ switch (msg->message) {
+ case WM_THEMECHANGED:
+ case WM_SYSCOLORCHANGE:
+ case WM_DWMCOLORIZATIONCOLORCHANGED: {
update();
break;
}
+ case WM_SETTINGCHANGE: {
+ if (isImmersiveColorSetChange(msg->wParam, msg->lParam)) {
+ update();
+ }
+ break;
+ }
+
+ default:
+ break;
+ }
+ return false;
+ }
+
+ bool BorderItem::sharedEventFilter(QObject *obj, QEvent *event) {
+ Q_UNUSED(obj)
+ switch (event->type()) {
+ case QEvent::WindowStateChange: {
+ updateGeometry();
+ break;
+ }
default:
break;
}
@@ -100,11 +143,10 @@
void QuickWindowAgentPrivate::setupWindows10BorderWorkaround() {
// Install painting hook
auto ctx = context.get();
- if (ctx->property("needBorderPainter").toBool()) {
+ if (ctx->windowAttribute(QStringLiteral("win10-border-needed")).toBool()) {
std::ignore = new BorderItem(hostWindow->contentItem(), ctx);
}
}
+#endif
}
-
-#include "quickwindowagent_win.moc"
\ No newline at end of file
--
Gitblit v1.9.1