Merge branch 'zhuzichu520:main' into add_disable_behavior_on_flutext

2024-11-23 03:10:10 +08:00 · 2024-11-22 16:33:02 +08:00 · 2024-11-22 16:33:02 +08:00 · 0b371ecd3f
commit 0b371ecd3f
parent 875bba2bd6 0171c3609a
17 changed files with 49 additions and 20 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,7 @@ Canvas {
    function animateToNewData()
    {
        chartAnimationProgress = 0.1;
-        d.jsChart.update();
+        d.jsChart?.update();
        chartAnimator.restart();
    }
    QtObject{
--- a/src/Qt5/imports/FluentUI/Controls/FluComboBox.qml
+++ b/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 {
--- a/src/Qt5/imports/FluentUI/Controls/FluContentDialog.qml
+++ b/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
--- a/src/Qt5/imports/FluentUI/Controls/FluInfoBar.qml
+++ b/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)
                    }
--- a/src/Qt5/imports/FluentUI/Controls/FluMultilineTextBox.qml
+++ b/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
--- a/src/Qt5/imports/FluentUI/Controls/FluScrollablePage.qml
+++ b/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
+        }
+    }
 }
--- a/src/Qt5/imports/FluentUI/Controls/FluTimeline.qml
+++ b/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
--- a/src/Qt5/imports/FluentUI/Controls/FluTour.qml
+++ b/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: {
--- a/src/Qt6/imports/FluentUI/Controls/FluChart.qml
+++ b/src/Qt6/imports/FluentUI/Controls/FluChart.qml
@ -14,7 +14,7 @@ Canvas {
    function animateToNewData()
    {
        chartAnimationProgress = 0.1;
-        d.jsChart.update();
+        d.jsChart?.update();
        chartAnimator.restart();
    }
    QtObject{
--- a/src/Qt6/imports/FluentUI/Controls/FluComboBox.qml
+++ b/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 {
--- a/src/Qt6/imports/FluentUI/Controls/FluContentDialog.qml
+++ b/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
--- a/src/Qt6/imports/FluentUI/Controls/FluInfoBar.qml
+++ b/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)
                    }
--- a/src/Qt6/imports/FluentUI/Controls/FluMultilineTextBox.qml
+++ b/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
--- a/src/Qt6/imports/FluentUI/Controls/FluScrollablePage.qml
+++ b/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
+        }
+    }
 }
--- a/src/Qt6/imports/FluentUI/Controls/FluTimeline.qml
+++ b/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
--- a/src/Qt6/imports/FluentUI/Controls/FluTour.qml
+++ b/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: {