From 9d32e8e13b837761af05fa8c030051cfcb825362 Mon Sep 17 00:00:00 2001 From: lucky9loogn Date: Fri, 22 Nov 2024 14:56:32 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20FluChart=20=E5=9C=A8?= =?UTF-8?q?=20Qt=205.15.2=20=E4=B8=8B=E5=8F=AF=E9=80=89=E9=93=BE=20(=3F.)?= =?UTF-8?q?=20=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Qt5/imports/FluentUI/Controls/FluChart.qml | 4 +++- src/Qt6/imports/FluentUI/Controls/FluChart.qml | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/Qt5/imports/FluentUI/Controls/FluChart.qml b/src/Qt5/imports/FluentUI/Controls/FluChart.qml index f47bd20d..457da42e 100644 --- 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{ diff --git a/src/Qt6/imports/FluentUI/Controls/FluChart.qml b/src/Qt6/imports/FluentUI/Controls/FluChart.qml index 30af5ab3..8153c3d8 100644 --- 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{ From 489526988d6734ff4368279318d1ffb37e150b8f Mon Sep 17 00:00:00 2001 From: lucky9loogn Date: Fri, 22 Nov 2024 15:40:32 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20FluProgressBar=20?= =?UTF-8?q?=E6=94=BE=E5=88=B0=20FluContentDialog=20=E5=86=85=E5=AF=B9?= =?UTF-8?q?=E8=AF=9D=E6=A1=86=E5=88=9A=E6=89=93=E5=BC=80=E6=97=B6=E5=8A=A8?= =?UTF-8?q?=E7=94=BB=E5=8D=A1=E9=A1=BF=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Qt5/imports/FluentUI/Controls/FluProgressBar.qml | 12 +++++++----- src/Qt6/imports/FluentUI/Controls/FluProgressBar.qml | 12 +++++++----- 2 files changed, 14 insertions(+), 10 deletions(-) diff --git a/src/Qt5/imports/FluentUI/Controls/FluProgressBar.qml b/src/Qt5/imports/FluentUI/Controls/FluProgressBar.qml index c89ba6fb..e75b47ba 100644 --- a/src/Qt5/imports/FluentUI/Controls/FluProgressBar.qml +++ b/src/Qt5/imports/FluentUI/Controls/FluProgressBar.qml @@ -41,13 +41,15 @@ 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 - duration: control.duration + PropertyAnimation { + from: -rect_progress.width + to: control.width + rect_progress.width + duration: control.duration + } } } } diff --git a/src/Qt6/imports/FluentUI/Controls/FluProgressBar.qml b/src/Qt6/imports/FluentUI/Controls/FluProgressBar.qml index bca37cea..9c2c6123 100644 --- a/src/Qt6/imports/FluentUI/Controls/FluProgressBar.qml +++ b/src/Qt6/imports/FluentUI/Controls/FluProgressBar.qml @@ -42,13 +42,15 @@ 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 - duration: control.duration + PropertyAnimation { + from: -rect_progress.width + to: control.width + rect_progress.width + duration: control.duration + } } } }