update

zhuzichu520 · May 7, 2024 · 655eff4 · 655eff4
1 parent b916221
commit 655eff4
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 17 deletions.
diff --git a/example/qml/page/T_RadioButton.qml b/example/qml/page/T_RadioButton.qml
@@ -164,7 +164,7 @@ FluScrollablePage{
                 verticalCenter: parent.verticalCenter
                 left: parent.left
             }
-            currentIndex: 1
+            currentIndex: -1
             FluCheckBox{
                 disabled: radio_button_switch4.checked
                 text: qsTr("Radio Button_1")

diff --git a/src/Qt5/imports/FluentUI/Controls/FluRadioButtons.qml b/src/Qt5/imports/FluentUI/Controls/FluRadioButtons.qml
@@ -18,7 +18,9 @@ Item{
             for(var i = 0;i<buttons.length;i++){
                 buttons[i].checked = false
             }
-            buttons[currentIndex].checked = true
+            if(currentIndex>=0 && currentIndex<buttons.length){
+                buttons[currentIndex].checked = true
+            }
         }
     }
     implicitWidth: childrenRect.width
@@ -42,17 +44,14 @@ Item{
                         }
                     }
                 }
-                if(control.currentIndex < 0){
-                    control.currentIndex = 0
-                }
                 d.updateChecked()
             }
         }
     }
     Component{
         id:com_horizontal
         RowLayout {
-            data: buttons
+            data: control.buttons
             spacing: control.spacing
             Component.onCompleted: {
                 for(var i = 0;i<control.buttons.length;i++){
@@ -65,9 +64,6 @@ Item{
                         }
                     }
                 }
-                if(control.currentIndex < 0){
-                    control.currentIndex = 0
-                }
                 d.updateChecked()
             }
         }

diff --git a/src/Qt6/imports/FluentUI/Controls/FluRadioButtons.qml b/src/Qt6/imports/FluentUI/Controls/FluRadioButtons.qml
@@ -19,7 +19,9 @@ Item{
             for(var i = 0;i<buttons.length;i++){
                 buttons[i].checked = false
             }
-            buttons[currentIndex].checked = true
+            if(currentIndex>=0 && currentIndex<buttons.length){
+                buttons[currentIndex].checked = true
+            }
         }
     }
     implicitWidth: childrenRect.width
@@ -43,17 +45,14 @@ Item{
                         }
                     }
                 }
-                if(control.currentIndex < 0){
-                    control.currentIndex = 0
-                }
                 d.updateChecked()
             }
         }
     }
     Component{
         id:com_horizontal
         RowLayout {
-            data: buttons
+            data: control.buttons
             spacing: control.spacing
             Component.onCompleted: {
                 for(var i = 0;i<control.buttons.length;i++){
@@ -66,9 +65,6 @@ Item{
                         }
                     }
                 }
-                if(control.currentIndex < 0){
-                    control.currentIndex = 0
-                }
                 d.updateChecked()
             }
         }