diff --git a/src/Qt5/imports/FluentUI/Controls/FluControlBackground.qml b/src/Qt5/imports/FluentUI/Controls/FluControlBackground.qml index 30c79c60..32b7543f 100644 --- a/src/Qt5/imports/FluentUI/Controls/FluControlBackground.qml +++ b/src/Qt5/imports/FluentUI/Controls/FluControlBackground.qml @@ -26,7 +26,8 @@ Item{ radius: control.radius gradient: Gradient { GradientStop { position: 0.0; color: d.startColor } - GradientStop { position: 0.88; color: d.startColor } + GradientStop { position: 1 - 3/control.height; color: d.startColor } + GradientStop { position: 1 - 2/control.height; color: d.startColor } GradientStop { position: 1.0; color: d.endColor} } } @@ -40,6 +41,12 @@ Item{ leftMargin: control.leftMargin rightMargin: control.rightMargin } + Behavior on anchors.bottomMargin { + NumberAnimation{ + easing.type: Easing.OutCubic + duration: 167 + } + } radius: control.radius color: control.color } diff --git a/src/Qt5/imports/FluentUI/Controls/FluShadow.qml b/src/Qt5/imports/FluentUI/Controls/FluShadow.qml index 0accdf7b..34c95753 100644 --- a/src/Qt5/imports/FluentUI/Controls/FluShadow.qml +++ b/src/Qt5/imports/FluentUI/Controls/FluShadow.qml @@ -5,7 +5,7 @@ import FluentUI 1.0 Item { //高性能阴影!!!比DropShadow阴影性能高出数倍!!! property color color: FluTheme.dark ? "#AAAAAA" : "#999999" - property int elevation: 6 + property int elevation: 5 property int radius: 4 id:control anchors.fill: parent diff --git a/src/Qt5/imports/FluentUI/Controls/FluTextBoxBackground.qml b/src/Qt5/imports/FluentUI/Controls/FluTextBoxBackground.qml index f4ec61f8..4c53b26e 100644 --- a/src/Qt5/imports/FluentUI/Controls/FluTextBoxBackground.qml +++ b/src/Qt5/imports/FluentUI/Controls/FluTextBoxBackground.qml @@ -20,13 +20,14 @@ FluControlBackground{ border.width: 1 gradient: Gradient { GradientStop { position: 0.0; color: d.startColor } - GradientStop { position: 1 - 3/control.height; color: d.startColor } - GradientStop { position: 1 - 2/control.height; color: d.startColor } + GradientStop { position: 1 - d.offsetSize/control.height; color: d.startColor } + GradientStop { position: 1 - 1/control.height; color: d.endColor } GradientStop { position: 1.0; color: d.endColor } } bottomMargin: inputItem && inputItem.activeFocus ? 2 : 1 QtObject{ id:d + property int offsetSize : inputItem && inputItem.activeFocus ? 2 : 3 property color startColor: FluTheme.dark ? Qt.rgba(66/255,66/255,66/255,1) : Qt.rgba(232/255,232/255,232/255,1) property color endColor: { if(!control.enabled){ diff --git a/src/Qt6/imports/FluentUI/Controls/FluControlBackground.qml b/src/Qt6/imports/FluentUI/Controls/FluControlBackground.qml index 3a91d3f3..b48f05fe 100644 --- a/src/Qt6/imports/FluentUI/Controls/FluControlBackground.qml +++ b/src/Qt6/imports/FluentUI/Controls/FluControlBackground.qml @@ -26,7 +26,8 @@ Item{ radius: control.radius gradient: Gradient { GradientStop { position: 0.0; color: d.startColor } - GradientStop { position: 0.88; color: d.startColor } + GradientStop { position: 1 - 3/control.height; color: d.startColor } + GradientStop { position: 1 - 2/control.height; color: d.startColor } GradientStop { position: 1.0; color: d.endColor} } } @@ -40,6 +41,12 @@ Item{ leftMargin: control.leftMargin rightMargin: control.rightMargin } + Behavior on anchors.bottomMargin { + NumberAnimation{ + easing.type: Easing.OutCubic + duration: 167 + } + } radius: control.radius color: control.color } diff --git a/src/Qt6/imports/FluentUI/Controls/FluShadow.qml b/src/Qt6/imports/FluentUI/Controls/FluShadow.qml index 6f9439d4..4ca1b7ae 100644 --- a/src/Qt6/imports/FluentUI/Controls/FluShadow.qml +++ b/src/Qt6/imports/FluentUI/Controls/FluShadow.qml @@ -5,7 +5,7 @@ import FluentUI Item { //高性能阴影!!!比DropShadow阴影性能高出数倍!!! property color color: FluTheme.dark ? "#AAAAAA" : "#999999" - property int elevation: 6 + property int elevation: 5 property int radius: 4 id:control anchors.fill: parent diff --git a/src/Qt6/imports/FluentUI/Controls/FluTextBoxBackground.qml b/src/Qt6/imports/FluentUI/Controls/FluTextBoxBackground.qml index 03dce01d..dcd34a6e 100644 --- a/src/Qt6/imports/FluentUI/Controls/FluTextBoxBackground.qml +++ b/src/Qt6/imports/FluentUI/Controls/FluTextBoxBackground.qml @@ -20,13 +20,14 @@ FluControlBackground{ border.width: 1 gradient: Gradient { GradientStop { position: 0.0; color: d.startColor } - GradientStop { position: 1 - 3/control.height; color: d.startColor } - GradientStop { position: 1 - 2/control.height; color: d.startColor } + GradientStop { position: 1 - d.offsetSize/control.height; color: d.startColor } + GradientStop { position: 1 - 1/control.height; color: d.endColor } GradientStop { position: 1.0; color: d.endColor } } bottomMargin: inputItem && inputItem.activeFocus ? 2 : 1 QtObject{ id:d + property int offsetSize : inputItem && inputItem.activeFocus ? 2 : 3 property color startColor: FluTheme.dark ? Qt.rgba(66/255,66/255,66/255,1) : Qt.rgba(232/255,232/255,232/255,1) property color endColor: { if(!control.enabled){