From 3e942c3dc8955be577079fbc028ce216e1c594b2 Mon Sep 17 00:00:00 2001
From: SineStriker <55847490+SineStriker@users.noreply.github.com>
Date: 周二, 11 2月 2025 19:07:53 +0800
Subject: [PATCH] Fix numerous bugs (#162)
---
src/quick/quickwindowagent_win.cpp | 134 ++++++++++++++++++++++++++++----------------
1 files changed, 85 insertions(+), 49 deletions(-)
diff --git a/src/quick/quickwindowagent_win.cpp b/src/quick/quickwindowagent_win.cpp
index 57c5f40..acfdd42 100644
--- a/src/quick/quickwindowagent_win.cpp
+++ b/src/quick/quickwindowagent_win.cpp
@@ -1,47 +1,72 @@
+// Copyright (C) 2023-2024 Stdware Collections (https://www.github.com/stdware)
+// Copyright (C) 2021-2023 wangwenx190 (Yuhang Zhao)
+// SPDX-License-Identifier: Apache-2.0
+
#include "quickwindowagent_p.h"
#include <QtQuick/QQuickPaintedItem>
#include <QtQuick/private/qquickitem_p.h>
#include <QWKCore/qwindowkit_windows.h>
+#include <QWKCore/private/windows10borderhandler_p.h>
namespace QWK {
-#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.
+ static inline bool isWindows1022H2OrGreater() {
+ RTL_OSVERSIONINFOW rovi = Private::GetRealOSVersion();
+ return (rovi.dwMajorVersion > 10) ||
+ (rovi.dwMajorVersion == 10 &&
+ (rovi.dwMinorVersion > 0 || rovi.dwBuildNumber >= 19045));
+ }
- class BorderItem : public QQuickPaintedItem,
- public NativeEventFilter,
- public SharedEventFilter {
+#if QWINDOWKIT_CONFIG(ENABLE_WINDOWS_SYSTEM_BORDERS)
+
+ class BorderItem : public QQuickPaintedItem, public Windows10BorderHandler {
public:
explicit BorderItem(QQuickItem *parent, AbstractWindowContext *context);
~BorderItem() override;
- inline bool isNormalWindow() const;
-
- inline void updateGeometry();
+ bool shouldEnableEmulatedPainter() const;
+ void updateGeometry() override;
public:
void paint(QPainter *painter) override;
void itemChange(ItemChange change, const ItemChangeData &data) override;
protected:
+ bool sharedEventFilter(QObject *obj, 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;
-
private:
+ volatile bool needPaint = false;
+
+ void _q_afterSynchronizing();
void _q_windowActivityChanged();
};
+ bool BorderItem::shouldEnableEmulatedPainter() const {
+# if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+ auto api = window()->rendererInterface()->graphicsApi();
+ switch (api) {
+ case QSGRendererInterface::OpenGL:
+ // FIXME: experimental, try to find the exact fixed version.
+ return !isWindows1022H2OrGreater();
+ case QSGRendererInterface::Direct3D11:
+# if QT_VERSION >= QT_VERSION_CHECK(6, 6, 0)
+ case QSGRendererInterface::Direct3D12:
+# endif
+ return false;
+ default:
+ break;
+ }
+# endif
+ return true;
+ }
+
BorderItem::BorderItem(QQuickItem *parent, AbstractWindowContext *context)
- : QQuickPaintedItem(parent), context(context) {
- setAntialiasing(true); // We needs anti-aliasing to give us better result.
+ : QQuickPaintedItem(parent), Windows10BorderHandler(context) {
+ setAntialiasing(true); // We need 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.
@@ -52,37 +77,44 @@
anchors->setLeft(parentPri->left());
anchors->setRight(parentPri->right());
- setZ(9999); // Make sure our fake border always above everything in the window.
+ setZ(std::numeric_limits<qreal>::max()); // Make sure our fake border always above
+ // everything in the window.
- context->installNativeEventFilter(this);
- context->installSharedEventFilter(this);
-
+# if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+ connect(window(), &QQuickWindow::afterSynchronizing, this,
+ &BorderItem::_q_afterSynchronizing, Qt::DirectConnection);
+# endif
connect(window(), &QQuickWindow::activeChanged, this,
&BorderItem::_q_windowActivityChanged);
- updateGeometry();
+
+ // First update
+ if (context->windowId()) {
+ setupNecessaryAttributes();
+ }
+ BorderItem::updateGeometry();
}
BorderItem::~BorderItem() = default;
- bool BorderItem::isNormalWindow() const {
- return !(context->window()->windowState() &
- (Qt::WindowMinimized | Qt::WindowMaximized | Qt::WindowFullScreen));
- }
-
void BorderItem::updateGeometry() {
- setHeight(context->windowAttribute(QStringLiteral("border-thickness")).toInt());
+ setHeight(borderThickness());
setVisible(isNormalWindow());
}
void BorderItem::paint(QPainter *painter) {
- QRect rect(QPoint(0, 0), size().toSize());
- QRegion region(rect);
- void *args[] = {
- painter,
- &rect,
- ®ion,
- };
- context->virtual_hook(AbstractWindowContext::DrawWindows10BorderHook, args);
+ Q_UNUSED(painter)
+ if (shouldEnableEmulatedPainter()) {
+ QRect rect(QPoint(0, 0), size().toSize());
+ QRegion region(rect);
+ void *args[] = {
+ painter,
+ &rect,
+ ®ion,
+ };
+ ctx->virtual_hook(AbstractWindowContext::DrawWindows10BorderHook_Emulated, args);
+ } else {
+ needPaint = true;
+ }
}
void BorderItem::itemChange(ItemChange change, const ItemChangeData &data) {
@@ -98,10 +130,21 @@
}
}
+ bool BorderItem::sharedEventFilter(QObject *obj, QEvent *event) {
+ Q_UNUSED(obj)
+
+ switch (event->type()) {
+ case QEvent::WindowStateChange: {
+ updateGeometry();
+ }
+ default:
+ break;
+ }
+ return Windows10BorderHandler::sharedEventFilter(obj, event);
+ }
+
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:
@@ -121,21 +164,14 @@
default:
break;
}
- return false;
+ return Windows10BorderHandler::nativeEventFilter(eventType, message, result);
}
- bool BorderItem::sharedEventFilter(QObject *obj, QEvent *event) {
- Q_UNUSED(obj)
-
- switch (event->type()) {
- case QEvent::WindowStateChange: {
- updateGeometry();
- break;
- }
- default:
- break;
+ void BorderItem::_q_afterSynchronizing() {
+ if (needPaint) {
+ needPaint = false;
+ drawBorder();
}
- return false;
}
void BorderItem::_q_windowActivityChanged() {
--
Gitblit v1.9.1