Merge pull request #589 from soulwyb/repair-FluPivot-example-error

修复Pivot的示例代码错误

.vscode/settings.json

@@ -0,0 +1,20 @@
+{
+    "MicroPython.executeButton": [
+        {
+            "text": "▶",
+            "tooltip": "运行",
+            "alignment": "left",
+            "command": "extension.executeFile",
+            "priority": 3.5
+        }
+    ],
+    "MicroPython.syncButton": [
+        {
+            "text": "$(sync)",
+            "tooltip": "同步",
+            "alignment": "left",
+            "command": "extension.execute",
+            "priority": 4
+        }
+    ]
+}

example/qml/page/T_Pivot.qml

@@ -49,26 +49,26 @@ FluScrollablePage{
         Layout.topMargin: -6
         code:'FluPivot{
     anchors.fill: parent
-    FluPivotItem:{
+    FluPivotItem {
-        text: qsTr("All")
+        title: qsTr("All")
         contentItem: FluText{
             text: qsTr("All emails go here.")
         }
     }
-    FluPivotItem:{
+    FluPivotItem {
-        text: qsTr("Unread")
+        title: qsTr("Unread")
         contentItem: FluText{
             text: qsTr("Unread emails go here.")
         }
     }
-    FluPivotItem:{
+    FluPivotItem {
-        text: qsTr("Flagged")
+        title: qsTr("Flagged")
         contentItem: FluText{
             text: qsTr("Flagged emails go here.")
         }
     }
-    FluPivotItem:{
+    FluPivotItem {
-        text: qsTr("Urgent")
+        title: qsTr("Urgent")
         contentItem: FluText{
             text: qsTr("Urgent emails go here.")
         }

src/Qt5/imports/FluentUI/Controls/FluCarousel.qml

@@ -24,7 +24,7 @@ Item {
     }
     QtObject{
         id:d
-        property bool flagXChanged: true
+        property bool flagXChanged: false
         property bool isAnimEnable: control.autoPlay && list_view.count>3
         function setData(data){
             if(!data){
@@ -88,14 +88,17 @@ Item {
             }
         }
         onMovementEnded:{
+            d.flagXChanged = false
+            list_view.highlightMoveDuration = 0
             currentIndex = list_view.contentX/list_view.width
             if(currentIndex === 0){
                 currentIndex = list_view.count-2
             }else if(currentIndex === list_view.count-1){
                 currentIndex = 1
             }
-            d.flagXChanged = false
+            if(d.isAnimEnable){
-            timer_run.restart()
+                timer_run.restart()
+            }
         }
         onMovementStarted: {
             d.flagXChanged = true
@@ -104,12 +107,12 @@ Item {
         onContentXChanged: {
             if(d.flagXChanged){
                 var maxX = Math.min(list_view.width*(currentIndex+1),list_view.count*list_view.width)
-                var minY = Math.max(0,(list_view.width*(currentIndex-1)))
+                var minX = Math.max(0,(list_view.width*(currentIndex-1)))
                 if(contentX>=maxX){
                     contentX = maxX
                 }
-                if(contentX<=minY){
+                if(contentX<=minX){
-                    contentX = minY
+                    contentX = minX
                 }
             }
         }

src/Qt5/imports/FluentUI/Controls/FluProgressBar.qml

@@ -14,13 +14,6 @@ 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
@@ -45,6 +38,11 @@ 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

src/Qt6/imports/FluentUI/Controls/FluCarousel.qml

@@ -24,7 +24,7 @@ Item {
     }
     QtObject{
         id:d
-        property bool flagXChanged: true
+        property bool flagXChanged: false
         property bool isAnimEnable: control.autoPlay && list_view.count>3
         function setData(data){
             if(!data){
@@ -88,14 +88,17 @@ Item {
             }
         }
         onMovementEnded:{
+            d.flagXChanged = false
+            list_view.highlightMoveDuration = 0
             currentIndex = list_view.contentX/list_view.width
             if(currentIndex === 0){
                 currentIndex = list_view.count-2
             }else if(currentIndex === list_view.count-1){
                 currentIndex = 1
             }
-            d.flagXChanged = false
+            if(d.isAnimEnable){
-            timer_run.restart()
+                timer_run.restart()
+            }
         }
         onMovementStarted: {
             d.flagXChanged = true
@@ -104,12 +107,12 @@ Item {
         onContentXChanged: {
             if(d.flagXChanged){
                 var maxX = Math.min(list_view.width*(currentIndex+1),list_view.count*list_view.width)
-                var minY = Math.max(0,(list_view.width*(currentIndex-1)))
+                var minX = Math.max(0,(list_view.width*(currentIndex-1)))
                 if(contentX>=maxX){
                     contentX = maxX
                 }
-                if(contentX<=minY){
+                if(contentX<=minX){
-                    contentX = minY
+                    contentX = minX
                 }
             }
         }

src/Qt6/imports/FluentUI/Controls/FluProgressBar.qml

@@ -15,13 +15,6 @@ 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
@@ -46,6 +39,11 @@ 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