From f701f9775659ed43b96338cbcc82186c8c06b37f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9C=B1=E5=AD=90=E6=A5=9A=5Czhuzi?= Date: Sun, 14 Apr 2024 11:43:32 +0800 Subject: [PATCH] update --- src/FluFrameless.cpp | 12 ++++++------ src/FluTheme.cpp | 1 - src/Qt5/imports/FluentUI/Controls/FluAppBar.qml | 4 ++-- src/Qt6/imports/FluentUI/Controls/FluAppBar.qml | 4 ++-- 4 files changed, 10 insertions(+), 11 deletions(-) diff --git a/src/FluFrameless.cpp b/src/FluFrameless.cpp index 7448f8ea..0e445c26 100644 --- a/src/FluFrameless.cpp +++ b/src/FluFrameless.cpp @@ -164,15 +164,15 @@ void FluFrameless::componentComplete() { #if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) if (!isMaximum) { clientRect->top = originalTop + offsetSize; - clientRect->bottom = originalBottom - offsetSize; - clientRect->left = originalLeft + offsetSize; - clientRect->right = originalRight - offsetSize; + clientRect->bottom = originalBottom; + clientRect->left = originalLeft; + clientRect->right = originalRight; } #else clientRect->top = originalTop + offsetSize; - clientRect->bottom = originalBottom - offsetSize; - clientRect->left = originalLeft + offsetSize; - clientRect->right = originalRight - offsetSize; + clientRect->bottom = originalBottom; + clientRect->left = originalLeft; + clientRect->right = originalRight; #endif _setMaximizeHovered(false); *result = WVR_REDRAW; diff --git a/src/FluTheme.cpp b/src/FluTheme.cpp index 84e13c57..1662aa7e 100644 --- a/src/FluTheme.cpp +++ b/src/FluTheme.cpp @@ -25,7 +25,6 @@ FluTheme::FluTheme(QObject *parent) : QObject{parent} { _blurBehindWindowEnabled = false; QGuiApplication::instance()->installEventFilter(this); refreshColors(); - checkUpdateDesktopImage(); connect(this, &FluTheme::darkModeChanged, this, [=] { Q_EMIT darkChanged(); }); diff --git a/src/Qt5/imports/FluentUI/Controls/FluAppBar.qml b/src/Qt5/imports/FluentUI/Controls/FluAppBar.qml index 73e9b444..74e7fc20 100644 --- a/src/Qt5/imports/FluentUI/Controls/FluAppBar.qml +++ b/src/Qt5/imports/FluentUI/Controls/FluAppBar.qml @@ -14,7 +14,7 @@ Rectangle{ property string closeText : qsTr("Close") property string stayTopText : qsTr("Sticky on Top") property string stayTopCancelText : qsTr("Sticky on Top cancelled") - property color textColor: FluTheme.dark ? "#FFFFFF" : "#000000" + property color textColor: FluTheme.fontPrimaryColor property color minimizeNormalColor: FluTheme.itemNormalColor property color minimizeHoverColor: FluTheme.itemHoverColor property color minimizePressColor: FluTheme.itemPressColor @@ -22,7 +22,7 @@ Rectangle{ property color maximizeHoverColor: FluTheme.itemHoverColor property color maximizePressColor: FluTheme.itemPressColor property color closeNormalColor: Qt.rgba(0,0,0,0) - property color closeHoverColor: Qt.rgba(251/255,115/255,115/255,1) + property color closeHoverColor: Qt.rgba(251/255,115/255,115/255,1) property color closePressColor: Qt.rgba(251/255,115/255,115/255,0.8) property bool showDark: false property bool showClose: true diff --git a/src/Qt6/imports/FluentUI/Controls/FluAppBar.qml b/src/Qt6/imports/FluentUI/Controls/FluAppBar.qml index 1724cc5f..8e4b6f13 100644 --- a/src/Qt6/imports/FluentUI/Controls/FluAppBar.qml +++ b/src/Qt6/imports/FluentUI/Controls/FluAppBar.qml @@ -14,7 +14,7 @@ Rectangle{ property string closeText : qsTr("Close") property string stayTopText : qsTr("Sticky on Top") property string stayTopCancelText : qsTr("Sticky on Top cancelled") - property color textColor: FluTheme.dark ? "#FFFFFF" : "#000000" + property color textColor: FluTheme.fontPrimaryColor property color minimizeNormalColor: FluTheme.itemNormalColor property color minimizeHoverColor: FluTheme.itemHoverColor property color minimizePressColor: FluTheme.itemPressColor @@ -22,7 +22,7 @@ Rectangle{ property color maximizeHoverColor: FluTheme.itemHoverColor property color maximizePressColor: FluTheme.itemPressColor property color closeNormalColor: Qt.rgba(0,0,0,0) - property color closeHoverColor: Qt.rgba(251/255,115/255,115/255,1) + property color closeHoverColor: Qt.rgba(251/255,115/255,115/255,1) property color closePressColor: Qt.rgba(251/255,115/255,115/255,0.8) property bool showDark: false property bool showClose: true