From 54623b054721d42db721d0ba7429b6f8878fc1a5 Mon Sep 17 00:00:00 2001
From: Sine Striker <trueful@163.com>
Date: 周二, 26 12月 2023 02:44:18 +0800
Subject: [PATCH] minor tweaks
---
src/quick/quickwindowagent_win.cpp | 39 ++++++++++++++++++++++++++++++++++-----
1 files changed, 34 insertions(+), 5 deletions(-)
diff --git a/src/quick/quickwindowagent_win.cpp b/src/quick/quickwindowagent_win.cpp
index 0d7fe92..a1966fd 100644
--- a/src/quick/quickwindowagent_win.cpp
+++ b/src/quick/quickwindowagent_win.cpp
@@ -3,16 +3,21 @@
#include <QtQuick/QQuickPaintedItem>
#include <QtQuick/private/qquickitem_p.h>
-#include <QWKCore/private/nativeeventfilter_p.h>
+#include <QWKCore/qwindowkit_windows.h>
namespace QWK {
- class BorderItem : public QQuickPaintedItem, public NativeEventFilter {
+#if QWINDOWKIT_CONFIG(ENABLE_WINDOWS_SYSTEM_BORDER)
+ 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;
@@ -21,6 +26,8 @@
protected:
bool nativeEventFilter(const QByteArray &eventType, void *message,
QT_NATIVE_EVENT_RESULT_TYPE *result) override;
+
+ bool sharedEventFilter(QObject *obj, QEvent *event) override;
AbstractWindowContext *context;
@@ -44,6 +51,8 @@
setZ(9999); // Make sure our fake border always above everything in the window.
context->installNativeEventFilter(this);
+ context->installSharedEventFilter(this);
+
connect(window(), &QQuickWindow::activeChanged, this,
&BorderItem::_q_windowActivityChanged);
updateGeometry();
@@ -51,8 +60,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) {
@@ -106,6 +121,19 @@
return false;
}
+ bool BorderItem::sharedEventFilter(QObject *obj, QEvent *event) {
+ Q_UNUSED(obj)
+ switch (event->type()) {
+ case QEvent::WindowStateChange: {
+ updateGeometry();
+ break;
+ }
+ default:
+ break;
+ }
+ return false;
+ }
+
void BorderItem::_q_windowActivityChanged() {
update();
}
@@ -113,9 +141,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
}
--
Gitblit v1.9.1