同步Qt6部分FluCarousel修改

修复FluCarousel设置autoPlay为false时不能无限向左/右翻页的问题
修复FluCarousel设置autoPlay为false时手动翻页仍触发自动轮播翻页问题 issue: #563
2025-02-18 14:18:41 +08:00 · 2025-02-17 23:31:46 +08:00 · 2025-02-17 23:27:02 +08:00
2 changed files with 14 additions and 10 deletions
--- a/src/Qt5/imports/FluentUI/Controls/FluProgressBar.qml
+++ b/src/Qt5/imports/FluentUI/Controls/FluProgressBar.qml
@ -14,6 +14,13 @@ ProgressBar{
        id:d
        property real _radius: strokeWidth/2
    }
+    onIndeterminateChanged:{
+        if(!indeterminate){
+            animator_x.duration = 0
+            rect_progress.x = 0
+            animator_x.duration = control.duration
+        }
+    }
    background: Rectangle {
        implicitWidth: 150
        implicitHeight: control.strokeWidth
@ -38,11 +45,6 @@ ProgressBar{
                id: animator_x
                running: control.indeterminate && control.visible
                loops: Animation.Infinite
-                onRunningChanged: {
-                    if(!running){
-                        rect_progress.x = 0
-                    }
-                }
                PropertyAnimation {
                    from: -rect_progress.width
                    to: control.width + rect_progress.width
--- a/src/Qt6/imports/FluentUI/Controls/FluProgressBar.qml
+++ b/src/Qt6/imports/FluentUI/Controls/FluProgressBar.qml
@ -15,6 +15,13 @@ ProgressBar{
        id:d
        property real _radius: strokeWidth/2
    }
+    onIndeterminateChanged:{
+        if(!indeterminate){
+            animator_x.duration = 0
+            rect_progress.x = 0
+            animator_x.duration = control.duration
+        }
+    }
    background: Rectangle {
        implicitWidth: 150
        implicitHeight: control.strokeWidth
@ -39,11 +46,6 @@ ProgressBar{
                id: animator_x
                running: control.indeterminate && control.visible
                loops: Animation.Infinite
-                onRunningChanged: {
-                    if(!running){
-                        rect_progress.x = 0
-                    }
-                }
                PropertyAnimation {
                    from: -rect_progress.width
                    to: control.width + rect_progress.width
Author	SHA1	Message	Date
Polaris-Night	6b4ca8e6fb	同步Qt6部分FluCarousel修改	2025-02-18 14:18:41 +08:00
Polaris-Night	2e5c09bfff	修复FluCarousel设置autoPlay为false时不能无限向左/右翻页的问题	2025-02-17 23:31:46 +08:00
Polaris-Night	e226599396	修复FluCarousel设置autoPlay为false时手动翻页仍触发自动轮播翻页问题 issue: #563	2025-02-17 23:27:02 +08:00