diff --git a/src/Qt5/imports/FluentUI/Controls/FluLoadingButton.qml b/src/Qt5/imports/FluentUI/Controls/FluLoadingButton.qml index 1281cbe3..597f3dc6 100644 --- a/src/Qt5/imports/FluentUI/Controls/FluLoadingButton.qml +++ b/src/Qt5/imports/FluentUI/Controls/FluLoadingButton.qml @@ -20,7 +20,7 @@ FluButton { width: control.loading ? 16 : 0 height: 16 anchors.verticalCenter: parent.verticalCenter - visible: width!==0 + visible: Number(width)!==0 clip: true Behavior on width { enabled: FluTheme.enableAnimation diff --git a/src/Qt5/imports/FluentUI/Controls/FluProgressRing.qml b/src/Qt5/imports/FluentUI/Controls/FluProgressRing.qml index c02268bf..b8a364e4 100644 --- a/src/Qt5/imports/FluentUI/Controls/FluProgressRing.qml +++ b/src/Qt5/imports/FluentUI/Controls/FluProgressRing.qml @@ -48,11 +48,13 @@ ProgressBar{ property real sweepAngle: 0 SequentialAnimation on startAngle { loops: Animation.Infinite + running: control.visible && control.indeterminate PropertyAnimation { from: 0; to: 450; duration: control.duration/2 } PropertyAnimation { from: 450; to: 1080; duration: control.duration/2 } } SequentialAnimation on sweepAngle { loops: Animation.Infinite + running: control.visible && control.indeterminate PropertyAnimation { from: 0; to: 180; duration: control.duration/2 } PropertyAnimation { from: 180; to: 0; duration: control.duration/2 } } diff --git a/src/Qt6/imports/FluentUI/Controls/FluLoadingButton.qml b/src/Qt6/imports/FluentUI/Controls/FluLoadingButton.qml index 1491a2d9..5b91a281 100644 --- a/src/Qt6/imports/FluentUI/Controls/FluLoadingButton.qml +++ b/src/Qt6/imports/FluentUI/Controls/FluLoadingButton.qml @@ -21,7 +21,7 @@ FluButton { width: control.loading ? 16 : 0 height: 16 anchors.verticalCenter: parent.verticalCenter - visible: width!==0 + visible: Number(width)!==0 clip: true Behavior on width { enabled: FluTheme.enableAnimation diff --git a/src/Qt6/imports/FluentUI/Controls/FluProgressRing.qml b/src/Qt6/imports/FluentUI/Controls/FluProgressRing.qml index 5813ef50..480aee9d 100644 --- a/src/Qt6/imports/FluentUI/Controls/FluProgressRing.qml +++ b/src/Qt6/imports/FluentUI/Controls/FluProgressRing.qml @@ -48,11 +48,13 @@ ProgressBar{ property real sweepAngle: 0 SequentialAnimation on startAngle { loops: Animation.Infinite + running: control.visible && control.indeterminate PropertyAnimation { from: 0; to: 450; duration: control.duration/2 } PropertyAnimation { from: 450; to: 1080; duration: control.duration/2 } } SequentialAnimation on sweepAngle { loops: Animation.Infinite + running: control.visible && control.indeterminate PropertyAnimation { from: 0; to: 180; duration: control.duration/2 } PropertyAnimation { from: 180; to: 0; duration: control.duration/2 } }