Merge branch 'zhuzichu520:main' into add_disable_behavior_on_flutext

尝试修复 FluChart 和 FluProgressBar 的一些问题

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">
 

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{

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

@@ -107,7 +107,7 @@ T.ComboBox {
         y: control.height
         width: control.width
         height: Math.min(contentItem.implicitHeight, control.Window.height - topMargin - bottomMargin)
-        topMargin: 6
+        topMargin: 32
         bottomMargin: 6
         modal: true
         contentItem: ListView {

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

@@ -41,7 +41,7 @@ FluPopup {
             FluText{
                 id:text_message
                 font: FluTextStyle.Body
-                wrapMode: Text.WrapAnywhere
+                wrapMode: Text.WordWrap
                 text:message
                 width: parent.width
                 topPadding: 4
@@ -67,7 +67,7 @@ FluPopup {
                 topPadding: 20
                 leftPadding: 20
                 rightPadding: 20
-                wrapMode: Text.WrapAnywhere
+                wrapMode: Text.WordWrap
             }
             FluLoader{
                 sourceComponent: com_message

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

@@ -190,13 +190,13 @@ FluObject {
                     spacing: 5
                     FluText{
                         text:_super.text
-                        wrapMode: Text.WrapAnywhere
+                        wrapMode: Text.WordWrap
                         width: Math.min(implicitWidth,mcontrol.maxWidth)
                     }
                     FluText{
                         text: _super.moremsg
                         visible: _super.moremsg
-                        wrapMode : Text.WrapAnywhere
+                        wrapMode : Text.WordWrap
                         textColor: FluColors.Grey120
                         width: Math.min(implicitWidth,mcontrol.maxWidth)
                     }

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

@@ -20,7 +20,7 @@ TextArea{
         return normalColor
     }
     font:FluTextStyle.Body
-    wrapMode: Text.WrapAnywhere
+    wrapMode: Text.WordWrap
     padding: 8
     leftPadding: padding+4
     renderType: FluTheme.nativeText ? Text.NativeRendering : Text.QtRendering

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

@@ -41,13 +41,15 @@ ProgressBar{
             height: parent.height
             radius: d._radius
             color: control.color
-            PropertyAnimation on x {
+            SequentialAnimation on x {
-                id:animator_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
+                }
             }
         }
     }

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

@@ -5,8 +5,11 @@ import QtQuick.Controls 2.15
 import FluentUI 1.0
 
 FluPage {
+    property bool autoResetScroll: false
     default property alias content: container.data
+
     Flickable{
+        id: flickable
         clip: true
         anchors.fill: parent
         ScrollBar.vertical: FluScrollBar {}
@@ -17,4 +20,14 @@ FluPage {
             width: parent.width
         }
     }
+
+    function resetScroll() {
+        flickable.contentY = 0;
+    }
+
+    StackView.onActivated: {
+        if (autoResetScroll) {
+            resetScroll(); // Call this function to reset the scroll position to the top
+        }
+    }
 }

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

@@ -98,7 +98,7 @@ Item{
     Component{
         id:com_lable
         FluText{
-            wrapMode: Text.WrapAnywhere
+            wrapMode: Text.WordWrap
             horizontalAlignment: isRight ? Qt.AlignRight : Qt.AlignLeft
             text: {
                 if(modelData.lable){
@@ -113,7 +113,7 @@ Item{
     Component{
         id:com_text
         FluText{
-            wrapMode: Text.WrapAnywhere
+            wrapMode: Text.WordWrap
             horizontalAlignment: isRight ? Qt.AlignRight : Qt.AlignLeft
             text: modelData.text
             textFormat: Text.RichText

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

@@ -175,7 +175,7 @@ Popup{
         FluText{
             id: text_desc
             font: FluTextStyle.Body
-            wrapMode: Text.WrapAnywhere
+            wrapMode: Text.WordWrap
             maximumLineCount: 4
             elide: Text.ElideRight
             text: {

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{

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

@@ -107,7 +107,7 @@ T.ComboBox {
         y: control.height
         width: control.width
         height: Math.min(contentItem.implicitHeight, control.Window.height - topMargin - bottomMargin)
-        topMargin: 6
+        topMargin: 32
         bottomMargin: 6
         modal: true
         contentItem: ListView {

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

@@ -41,7 +41,7 @@ FluPopup {
             FluText{
                 id:text_message
                 font: FluTextStyle.Body
-                wrapMode: Text.WrapAnywhere
+                wrapMode: Text.WordWrap
                 text:message
                 width: parent.width
                 topPadding: 4
@@ -67,7 +67,7 @@ FluPopup {
                 topPadding: 20
                 leftPadding: 20
                 rightPadding: 20
-                wrapMode: Text.WrapAnywhere
+                wrapMode: Text.WordWrap
             }
             FluLoader{
                 sourceComponent: com_message

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

@@ -190,13 +190,13 @@ FluObject {
                     spacing: 5
                     FluText{
                         text:_super.text
-                        wrapMode: Text.WrapAnywhere
+                        wrapMode: Text.WordWrap
                         width: Math.min(implicitWidth,mcontrol.maxWidth)
                     }
                     FluText{
                         text: _super.moremsg
                         visible: _super.moremsg
-                        wrapMode : Text.WrapAnywhere
+                        wrapMode : Text.WordWrap
                         textColor: FluColors.Grey120
                         width: Math.min(implicitWidth,mcontrol.maxWidth)
                     }

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

@@ -21,7 +21,7 @@ TextArea{
         return normalColor
     }
     font:FluTextStyle.Body
-    wrapMode: Text.WrapAnywhere
+    wrapMode: Text.WordWrap
     padding: 8
     leftPadding: padding+4
     renderType: FluTheme.nativeText ? Text.NativeRendering : Text.QtRendering

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

@@ -42,13 +42,15 @@ ProgressBar{
             height: parent.height
             radius: d._radius
             color: control.color
-            PropertyAnimation on x {
+            SequentialAnimation on x {
-                id:animator_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
+                }
             }
         }
     }

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

@@ -5,8 +5,11 @@ import QtQuick.Controls
 import FluentUI
 
 FluPage {
+    property bool autoResetScroll: false
     default property alias content: container.data
+
     Flickable{
+        id: flickable
         clip: true
         anchors.fill: parent
         ScrollBar.vertical: FluScrollBar {}
@@ -17,4 +20,14 @@ FluPage {
             width: parent.width
         }
     }
+
+    function resetScroll() {
+        flickable.contentY = 0;
+    }
+
+    StackView.onActivated: {
+        if (autoResetScroll) {
+            resetScroll(); // Call this function to reset the scroll position to the top
+        }
+    }
 }

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

@@ -98,7 +98,7 @@ Item{
     Component{
         id:com_lable
         FluText{
-            wrapMode: Text.WrapAnywhere
+            wrapMode: Text.WordWrap
             horizontalAlignment: isRight ? Qt.AlignRight : Qt.AlignLeft
             text: {
                 if(modelData.lable){
@@ -113,7 +113,7 @@ Item{
     Component{
         id:com_text
         FluText{
-            wrapMode: Text.WrapAnywhere
+            wrapMode: Text.WordWrap
             horizontalAlignment: isRight ? Qt.AlignRight : Qt.AlignLeft
             text: modelData.text
             textFormat: Text.RichText

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

@@ -175,7 +175,7 @@ Popup{
         FluText{
             id: text_desc
             font: FluTextStyle.Body
-            wrapMode: Text.WrapAnywhere
+            wrapMode: Text.WordWrap
             maximumLineCount: 4
             elide: Text.ElideRight
             text: {