From 02d1cd1ec0f544335ca1b31546737868a675439f Mon Sep 17 00:00:00 2001
From: Zhao Yuhang <2546789017@qq.com>
Date: 周六, 23 12月 2023 22:36:06 +0800
Subject: [PATCH] fix theme notify
---
src/quick/quickwindowagent_win.cpp | 16 +++++++++-------
1 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/src/quick/quickwindowagent_win.cpp b/src/quick/quickwindowagent_win.cpp
index 15418e2..8b2ea86 100644
--- a/src/quick/quickwindowagent_win.cpp
+++ b/src/quick/quickwindowagent_win.cpp
@@ -3,12 +3,14 @@
#include <QtQuick/QQuickPaintedItem>
#include <QtQuick/private/qquickitem_p.h>
+#include <QWKCore/qwindowkit_windows.h>
+#include <QWKCore/qwkconfig.h>
#include <QWKCore/private/nativeeventfilter_p.h>
namespace QWK {
+#if QWINDOWKIT_CONFIG(ENABLE_WINDOWS_SYSTEM_BORDER)
class BorderItem : public QQuickPaintedItem, public NativeEventFilter {
- Q_OBJECT
public:
explicit BorderItem(QQuickItem *parent, AbstractWindowContext *context);
~BorderItem() override;
@@ -31,8 +33,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.
@@ -43,7 +44,7 @@
anchors->setLeft(parentPri->left());
anchors->setRight(parentPri->right());
- setZ(10);
+ setZ(9999); // Make sure our fake border always above everything in the window.
context->installNativeEventFilter(this);
connect(window(), &QQuickWindow::activeChanged, this,
@@ -84,7 +85,7 @@
bool BorderItem::nativeEventFilter(const QByteArray &eventType, void *message,
QT_NATIVE_EVENT_RESULT_TYPE *result) {
Q_UNUSED(eventType)
- auto msg = reinterpret_cast<const MSG *>(message);
+ const auto msg = static_cast<const MSG *>(message);
switch (msg->message) {
case WM_THEMECHANGED:
case WM_SYSCOLORCHANGE:
@@ -111,15 +112,16 @@
void BorderItem::_q_windowActivityChanged() {
update();
}
+#endif
void QuickWindowAgentPrivate::setupWindows10BorderWorkaround() {
+#if QWINDOWKIT_CONFIG(ENABLE_WINDOWS_SYSTEM_BORDER)
// Install painting hook
auto ctx = context.get();
if (ctx->property("needBorderPainter").toBool()) {
std::ignore = new BorderItem(hostWindow->contentItem(), ctx);
}
+#endif
}
}
-
-#include "quickwindowagent_win.moc"
\ No newline at end of file
--
Gitblit v1.9.1