From 0b1755e9ebe78dd90d94205c8e721afd5cb60bbe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9C=B1=E5=AD=90=E6=A5=9A=5Czhuzi?= Date: Wed, 1 May 2024 01:11:25 +0800 Subject: [PATCH] update --- src/FluFrameless.cpp | 5 ++++- src/Qt5/imports/FluentUI/Controls/FluWindow.qml | 4 ++-- src/Qt6/imports/FluentUI/Controls/FluWindow.qml | 4 ++-- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/src/FluFrameless.cpp b/src/FluFrameless.cpp index 1b6ce37b..afe5d022 100644 --- a/src/FluFrameless.cpp +++ b/src/FluFrameless.cpp @@ -162,8 +162,8 @@ void FluFrameless::componentComplete() { } return false; } else if (uMsg == WM_NCCALCSIZE) { - const auto clientRect = ((wParam == FALSE) ? reinterpret_cast(lParam) : &(reinterpret_cast(lParam))->rgrc[0]); bool isMaximum = ::IsZoomed(hwnd); + const auto clientRect = ((wParam == FALSE) ? reinterpret_cast(lParam) : &(reinterpret_cast(lParam))->rgrc[0]); const LONG originalTop = clientRect->top; const LONG originalLeft = clientRect->left; const LONG originalBottom = clientRect->bottom; @@ -186,6 +186,9 @@ void FluFrameless::componentComplete() { clientRect->bottom = originalBottom - offsetXY; clientRect->left = originalLeft + offsetXY; clientRect->right = originalRight - offsetXY; +#if (QT_VERSION == QT_VERSION_CHECK(6, 5, 3) || QT_VERSION == QT_VERSION_CHECK(6, 6, 0)) + qWarning("This issue is Qt's own bug, which currently only exists in 6.5.3 and 6.6.0, and has been fixed in later versions"); +#endif } _setMaximizeHovered(false); *result = WVR_REDRAW; diff --git a/src/Qt5/imports/FluentUI/Controls/FluWindow.qml b/src/Qt5/imports/FluentUI/Controls/FluWindow.qml index 9457a11a..941bb1b1 100644 --- a/src/Qt5/imports/FluentUI/Controls/FluWindow.qml +++ b/src/Qt5/imports/FluentUI/Controls/FluWindow.qml @@ -61,8 +61,8 @@ Window { property var _windowRegister property string _route property bool _hideShadow: false - id:window - color:"transparent" + id: window + color: FluTools.isSoftware() ? window.backgroundColor : "transparent" Component.onCompleted: { FluRouter.addWindow(window) useSystemAppBar = FluApp.useSystemAppBar diff --git a/src/Qt6/imports/FluentUI/Controls/FluWindow.qml b/src/Qt6/imports/FluentUI/Controls/FluWindow.qml index b214e98c..0973a266 100644 --- a/src/Qt6/imports/FluentUI/Controls/FluWindow.qml +++ b/src/Qt6/imports/FluentUI/Controls/FluWindow.qml @@ -60,8 +60,8 @@ Window { property var _windowRegister property string _route property bool _hideShadow: false - id:window - color:"transparent" + id: window + color: FluTools.isSoftware() ? window.backgroundColor : "transparent" Component.onCompleted: { FluRouter.addWindow(window) useSystemAppBar = FluApp.useSystemAppBar