From 90809f50420422ff4c2f594f5dd8f082ca584a2c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9C=B1=E5=AD=90=E6=A5=9A=5Czhuzi?= Date: Tue, 27 Feb 2024 15:38:45 +0800 Subject: [PATCH] update --- src/FluFramelessHelper.cpp | 2 +- src/Qt5/imports/FluentUI/Controls/FluBadge.qml | 2 +- src/Qt6/imports/FluentUI/Controls/FluBadge.qml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/FluFramelessHelper.cpp b/src/FluFramelessHelper.cpp index 6dd0ea9c..c5acdcea 100644 --- a/src/FluFramelessHelper.cpp +++ b/src/FluFramelessHelper.cpp @@ -180,7 +180,7 @@ bool FramelessEventFilter::nativeEventFilter(const QByteArray &eventType, void * *result = DefWindowProcW(hwnd, WM_NCACTIVATE, wParam, -1); return true; }else if(uMsg == WM_GETMINMAXINFO){ -#if QT_VERSION < QT_VERSION_CHECK(6,0,0) +#if QT_VERSION < QT_VERSION_CHECK(6,2,4) MINMAXINFO* minmaxInfo = reinterpret_cast(lParam); auto pixelRatio = _helper->window->devicePixelRatio(); auto geometry = _helper->window->screen()->availableGeometry(); diff --git a/src/Qt5/imports/FluentUI/Controls/FluBadge.qml b/src/Qt5/imports/FluentUI/Controls/FluBadge.qml index 65d17f14..ec9277cc 100644 --- a/src/Qt5/imports/FluentUI/Controls/FluBadge.qml +++ b/src/Qt5/imports/FluentUI/Controls/FluBadge.qml @@ -66,7 +66,7 @@ Rectangle{ return true return count!==0 } - Text{ + FluText{ anchors.centerIn: parent color: Qt.rgba(1,1,1,1) visible: !isDot diff --git a/src/Qt6/imports/FluentUI/Controls/FluBadge.qml b/src/Qt6/imports/FluentUI/Controls/FluBadge.qml index 6b57c28b..d265891a 100644 --- a/src/Qt6/imports/FluentUI/Controls/FluBadge.qml +++ b/src/Qt6/imports/FluentUI/Controls/FluBadge.qml @@ -66,7 +66,7 @@ Rectangle{ return true return count!==0 } - Text{ + FluText{ anchors.centerIn: parent color: Qt.rgba(1,1,1,1) visible: !isDot