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

修复Pivot的示例代码错误
2025-02-21 12:01:57 +08:00 · 2025-02-21 11:34:54 +08:00 · 2025-02-21 11:23:30 +08:00 · 2025-02-20 20:15:21 +08:00 · 2025-02-20 20:11:01 +08:00
6 changed files with 56 additions and 34 deletions
--- a/.vscode/settings.json
+++ b/.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
+        }
+    ]
+}
--- a/example/qml/page/T_Pivot.qml
+++ b/example/qml/page/T_Pivot.qml
@ -49,26 +49,26 @@ FluScrollablePage{
        Layout.topMargin: -6
        code:'FluPivot{
    anchors.fill: parent
-    FluPivotItem:{
-        text: qsTr("All")
+    FluPivotItem {
+        title: qsTr("All")
        contentItem: FluText{
            text: qsTr("All emails go here.")
        }
    }
-    FluPivotItem:{
-        text: qsTr("Unread")
+    FluPivotItem {
+        title: qsTr("Unread")
        contentItem: FluText{
            text: qsTr("Unread emails go here.")
        }
    }
-    FluPivotItem:{
-        text: qsTr("Flagged")
+    FluPivotItem {
+        title: qsTr("Flagged")
        contentItem: FluText{
            text: qsTr("Flagged emails go here.")
        }
    }
-    FluPivotItem:{
-        text: qsTr("Urgent")
+    FluPivotItem {
+        title: qsTr("Urgent")
        contentItem: FluText{
            text: qsTr("Urgent emails go here.")
        }
--- a/src/Qt5/imports/FluentUI/Controls/FluCarousel.qml
+++ b/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
-            timer_run.restart()
+            if(d.isAnimEnable){
+                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){
-                    contentX = minY
+                if(contentX<=minX){
+                    contentX = minX
                }
            }
        }
--- a/src/Qt5/imports/FluentUI/Controls/FluProgressBar.qml
+++ b/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
--- a/src/Qt6/imports/FluentUI/Controls/FluCarousel.qml
+++ b/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
-            timer_run.restart()
+            if(d.isAnimEnable){
+                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){
-                    contentX = minY
+                if(contentX<=minX){
+                    contentX = minX
                }
            }
        }
--- a/src/Qt6/imports/FluentUI/Controls/FluProgressBar.qml
+++ b/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
Author	SHA1	Message	Date
zhuzichu	882cc8989f	Merge pull request #589 from soulwyb/repair-FluPivot-example-error 修复Pivot的示例代码错误	2025-02-21 12:01:57 +08:00
wuyubin	444cc1aeee	修复Pivot的示例代码错误	2025-02-21 11:34:54 +08:00
zhuzichu	db0588edcd	Merge pull request #588 from Polaris-Night/main 修复FluCarousel手动翻页的问题	2025-02-21 11:23:30 +08:00
Polaris-Night	99f6b16aa1	修复FluProgressBar属性错误	2025-02-20 20:15:21 +08:00
Polaris-Night	65b7737454	修复FluCarousel设置autoPlay为false时手动翻页仍触发自动轮播翻页问题. fixed #563 修复FluCarousel设置autoPlay为false时不能无限向左/右翻页的问题.	2025-02-20 20:11:01 +08:00