Merge pull request #574 from lucky9loogn/fix

尝试修复 FluChart 和 FluProgressBar 的一些问题
Update README.md
2025-02-10 16:55:40 +08:00 · 2024-11-22 16:42:03 +08:00 · 2024-11-22 15:58:45 +08:00 · 2024-11-22 15:40:32 +08:00 · 2024-11-22 14:56:32 +08:00
5 changed files with 23 additions and 12 deletions
--- a/README.md
+++ b/README.md
@ -1,3 +1,6 @@
+# ATTENTION! THIS REPO HAS BEEN DEPRECATED!
+# PLEASE USE THE BRAND NEW [FluentUI2](https://github.com/zhuzichu520/FluentUI2) INSTEAD!
+# THIS REPO IS NO LONGER MAINTAINED.
 <div align=center>
 <img width=64 src="doc/preview/fluent_design.svg">

--- a/src/Qt5/imports/FluentUI/Controls/FluChart.qml
+++ b/src/Qt5/imports/FluentUI/Controls/FluChart.qml
@ -15,7 +15,9 @@ Canvas {
    function animateToNewData()
    {
        chartAnimationProgress = 0.1;
-        d.jsChart?.update();
+        if (d.jsChart) {
+            d.jsChart.update();
+        }
        chartAnimator.restart();
    }
    QtObject{
--- a/src/Qt5/imports/FluentUI/Controls/FluProgressBar.qml
+++ b/src/Qt5/imports/FluentUI/Controls/FluProgressBar.qml
@ -41,16 +41,18 @@ ProgressBar{
            height: parent.height
            radius: d._radius
            color: control.color
-            PropertyAnimation on x {
-                id:animator_x
+            SequentialAnimation on x {
+                id: animator_x
                running: control.indeterminate && control.visible
-                from: -rect_progress.width
-                to:control.width+rect_progress.width
                loops: Animation.Infinite
+                PropertyAnimation {
+                    from: -rect_progress.width
+                    to: control.width + rect_progress.width
                    duration: control.duration
                }
            }
        }
+    }
    FluText{
        text:(control.visualPosition * 100).toFixed(0) + "%"
        visible: {
--- a/src/Qt6/imports/FluentUI/Controls/FluChart.qml
+++ b/src/Qt6/imports/FluentUI/Controls/FluChart.qml
@ -14,7 +14,9 @@ Canvas {
    function animateToNewData()
    {
        chartAnimationProgress = 0.1;
-        d.jsChart?.update();
+        if (d.jsChart) {
+            d.jsChart.update();
+        }
        chartAnimator.restart();
    }
    QtObject{
--- a/src/Qt6/imports/FluentUI/Controls/FluProgressBar.qml
+++ b/src/Qt6/imports/FluentUI/Controls/FluProgressBar.qml
@ -42,16 +42,18 @@ ProgressBar{
            height: parent.height
            radius: d._radius
            color: control.color
-            PropertyAnimation on x {
-                id:animator_x
+            SequentialAnimation on x {
+                id: animator_x
                running: control.indeterminate && control.visible
-                from: -rect_progress.width
-                to:control.width+rect_progress.width
                loops: Animation.Infinite
+                PropertyAnimation {
+                    from: -rect_progress.width
+                    to: control.width + rect_progress.width
                    duration: control.duration
                }
            }
        }
+    }
    FluText{
        text:(control.visualPosition * 100).toFixed(0) + "%"
        visible: {
Author	SHA1	Message	Date
zhuzichu	8ab0cde2e9	Merge pull request #574 from lucky9loogn/fix 尝试修复 FluChart 和 FluProgressBar 的一些问题	2024-11-22 16:42:03 +08:00
zhuzichu	0171c3609a	Update README.md	2024-11-22 15:58:45 +08:00
lucky9loogn	489526988d	修复 FluProgressBar 放到 FluContentDialog 内对话框刚打开时动画卡顿问题	2024-11-22 15:40:32 +08:00
lucky9loogn	9d32e8e13b	修复 FluChart 在 Qt 5.15.2 下可选链 (?.) 报错	2024-11-22 14:56:32 +08:00