From af270951da35874655f788ffabc10b97f493be67 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9C=B1=E5=AD=90=E6=A5=9A=5Czhuzi?=
 <zhuzichu520@outlook.com>
Date: Sat, 4 May 2024 23:56:20 +0800
Subject: [PATCH] update

---
 example/example_en_US.ts                      |  16 ++-
 example/example_zh_CN.ts                      |  16 ++-
 example/qml/page/T_RadioButton.qml            | 107 ++++++++++++++++++
 .../FluentUI/Controls/FluRadioButtons.qml     |  82 +++++++++++---
 .../FluentUI/Controls/FluRadioButtons.qml     |  82 +++++++++++---
 5 files changed, 259 insertions(+), 44 deletions(-)

diff --git a/example/example_en_US.ts b/example/example_en_US.ts
index 0545ca0e..7b417a49 100644
--- a/example/example_en_US.ts
+++ b/example/example_en_US.ts
@@ -1700,22 +1700,30 @@ My only desire is to be permitted to drive out the traitors and restore the Han.
     </message>
     <message>
         <location filename="qml/page/T_RadioButton.qml" line="38"/>
-        <location filename="qml/page/T_RadioButton.qml" line="80"/>
+        <location filename="qml/page/T_RadioButton.qml" line="81"/>
+        <location filename="qml/page/T_RadioButton.qml" line="134"/>
+        <location filename="qml/page/T_RadioButton.qml" line="187"/>
         <source>Disabled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="qml/page/T_RadioButton.qml" line="63"/>
+        <location filename="qml/page/T_RadioButton.qml" line="64"/>
+        <location filename="qml/page/T_RadioButton.qml" line="117"/>
+        <location filename="qml/page/T_RadioButton.qml" line="170"/>
         <source>Radio Button_1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="qml/page/T_RadioButton.qml" line="67"/>
+        <location filename="qml/page/T_RadioButton.qml" line="68"/>
+        <location filename="qml/page/T_RadioButton.qml" line="121"/>
+        <location filename="qml/page/T_RadioButton.qml" line="174"/>
         <source>Radio Button_2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="qml/page/T_RadioButton.qml" line="71"/>
+        <location filename="qml/page/T_RadioButton.qml" line="72"/>
+        <location filename="qml/page/T_RadioButton.qml" line="125"/>
+        <location filename="qml/page/T_RadioButton.qml" line="178"/>
         <source>Radio Button_3</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/example/example_zh_CN.ts b/example/example_zh_CN.ts
index 4c10312f..e798dfc6 100644
--- a/example/example_zh_CN.ts
+++ b/example/example_zh_CN.ts
@@ -1808,22 +1808,30 @@ My only desire is to be permitted to drive out the traitors and restore the Han.
     </message>
     <message>
         <location filename="qml/page/T_RadioButton.qml" line="38"/>
-        <location filename="qml/page/T_RadioButton.qml" line="80"/>
+        <location filename="qml/page/T_RadioButton.qml" line="81"/>
+        <location filename="qml/page/T_RadioButton.qml" line="134"/>
+        <location filename="qml/page/T_RadioButton.qml" line="187"/>
         <source>Disabled</source>
         <translation type="unfinished">禁用</translation>
     </message>
     <message>
-        <location filename="qml/page/T_RadioButton.qml" line="63"/>
+        <location filename="qml/page/T_RadioButton.qml" line="64"/>
+        <location filename="qml/page/T_RadioButton.qml" line="117"/>
+        <location filename="qml/page/T_RadioButton.qml" line="170"/>
         <source>Radio Button_1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="qml/page/T_RadioButton.qml" line="67"/>
+        <location filename="qml/page/T_RadioButton.qml" line="68"/>
+        <location filename="qml/page/T_RadioButton.qml" line="121"/>
+        <location filename="qml/page/T_RadioButton.qml" line="174"/>
         <source>Radio Button_2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="qml/page/T_RadioButton.qml" line="71"/>
+        <location filename="qml/page/T_RadioButton.qml" line="72"/>
+        <location filename="qml/page/T_RadioButton.qml" line="125"/>
+        <location filename="qml/page/T_RadioButton.qml" line="178"/>
         <source>Radio Button_3</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/example/qml/page/T_RadioButton.qml b/example/qml/page/T_RadioButton.qml
index 2f08e329..46fae27b 100644
--- a/example/qml/page/T_RadioButton.qml
+++ b/example/qml/page/T_RadioButton.qml
@@ -58,6 +58,7 @@ FluScrollablePage{
                 verticalCenter: parent.verticalCenter
                 left: parent.left
             }
+            currentIndex: 1
             FluRadioButton{
                 disabled: radio_button_switch2.checked
                 text: qsTr("Radio Button_1")
@@ -97,4 +98,110 @@ FluScrollablePage{
 }'
     }
 
+    FluFrame{
+        Layout.fillWidth: true
+        Layout.preferredHeight: 60
+        padding: 10
+        Layout.topMargin: 20
+        FluRadioButtons{
+            spacing: 8
+            anchors.verticalCenter: parent.verticalCenter
+            anchors{
+                verticalCenter: parent.verticalCenter
+                left: parent.left
+            }
+            orientation: Qt.Horizontal
+            currentIndex: 1
+            FluRadioButton{
+                disabled: radio_button_switch3.checked
+                text: qsTr("Radio Button_1")
+            }
+            FluRadioButton{
+                disabled: radio_button_switch3.checked
+                text: qsTr("Radio Button_2")
+            }
+            FluRadioButton{
+                disabled: radio_button_switch3.checked
+                text: qsTr("Radio Button_3")
+            }
+        }
+        FluToggleSwitch{
+            id: radio_button_switch3
+            anchors{
+                right: parent.right
+                verticalCenter: parent.verticalCenter
+            }
+            text: qsTr("Disabled")
+        }
+    }
+    CodeExpander{
+        Layout.fillWidth: true
+        Layout.topMargin: -6
+        code:'FluRadioButtons{
+    spacing: 8
+    orientation: Qt.Horizontal
+    FluRadioButton{
+        text:"Radio Button_1"
+    }
+    FluRadioButton{
+        text:"Radio Button_2"
+    }
+    FluRadioButton{
+        text:"Radio Button_3"
+    }
+}'
+    }
+
+    FluFrame{
+        Layout.fillWidth: true
+        Layout.preferredHeight: 100
+        padding: 10
+        Layout.topMargin: 20
+        FluRadioButtons{
+            spacing: 8
+            anchors.verticalCenter: parent.verticalCenter
+            anchors{
+                verticalCenter: parent.verticalCenter
+                left: parent.left
+            }
+            currentIndex: 1
+            FluCheckBox{
+                disabled: radio_button_switch4.checked
+                text: qsTr("Radio Button_1")
+            }
+            FluCheckBox{
+                disabled: radio_button_switch4.checked
+                text: qsTr("Radio Button_2")
+            }
+            FluCheckBox{
+                disabled: radio_button_switch4.checked
+                text: qsTr("Radio Button_3")
+            }
+        }
+        FluToggleSwitch{
+            id: radio_button_switch4
+            anchors{
+                right: parent.right
+                verticalCenter: parent.verticalCenter
+            }
+            text: qsTr("Disabled")
+        }
+    }
+    CodeExpander{
+        Layout.fillWidth: true
+        Layout.topMargin: -6
+        code:'FluRadioButtons{
+    spacing: 8
+    FluCheckBox{
+        text:"Radio Button_1"
+    }
+    FluCheckBox{
+        text:"Radio Button_2"
+    }
+    FluCheckBox{
+        text:"Radio Button_3"
+    }
+}'
+    }
+
 }
diff --git a/src/Qt5/imports/FluentUI/Controls/FluRadioButtons.qml b/src/Qt5/imports/FluentUI/Controls/FluRadioButtons.qml
index 83060795..2c79e575 100644
--- a/src/Qt5/imports/FluentUI/Controls/FluRadioButtons.qml
+++ b/src/Qt5/imports/FluentUI/Controls/FluRadioButtons.qml
@@ -3,30 +3,76 @@ import QtQuick.Controls 2.15
 import QtQuick.Layouts 1.15
 import FluentUI 1.0
 
-ColumnLayout {
-    default property alias buttons: control.data
-    property int currentIndex : -1
+Item{
     id:control
-    onCurrentIndexChanged: {
-        for(var i = 0;i<buttons.length;i++){
-            buttons[i].checked = false
-        }
-        var button = buttons[currentIndex]
-        if(button){
-            button.checked = true
+    default property list<QtObject> buttons
+    property int currentIndex : -1
+    property int spacing: 8
+    property int orientation: Qt.Vertical
+    QtObject{
+        id: d
+        function updateChecked(){
+            if(buttons.length === 0){
+                return
+            }
+            for(var i = 0;i<buttons.length;i++){
+                buttons[i].checked = false
+            }
+            buttons[currentIndex].checked = true
         }
     }
-    Component.onCompleted: {
-        for(var i = 0;i<buttons.length;i++){
-            buttons[i].clickListener = function(){
-                for(var i = 0;i<buttons.length;i++){
-                    var button = buttons[i]
-                    if(this === button){
-                        currentIndex = i
+    implicitWidth: childrenRect.width
+    implicitHeight: childrenRect.height
+    onCurrentIndexChanged: {
+        d.updateChecked()
+    }
+    Component{
+        id:com_vertical
+        ColumnLayout {
+            data: control.buttons
+            spacing: control.spacing
+            Component.onCompleted: {
+                for(var i = 0;i<control.buttons.length;i++){
+                    control.buttons[i].clickListener = function(){
+                        for(var i = 0;i<control.buttons.length;i++){
+                            var button = control.buttons[i]
+                            if(this === button){
+                                control.currentIndex = i
+                            }
+                        }
                     }
                 }
+                if(control.currentIndex < 0){
+                    control.currentIndex = 0
+                }
+                d.updateChecked()
             }
         }
-        currentIndex = 0
+    }
+    Component{
+        id:com_horizontal
+        RowLayout {
+            data: buttons
+            spacing: control.spacing
+            Component.onCompleted: {
+                for(var i = 0;i<control.buttons.length;i++){
+                    control.buttons[i].clickListener = function(){
+                        for(var i = 0;i<control.buttons.length;i++){
+                            var button = control.buttons[i]
+                            if(this === button){
+                                control.currentIndex = i
+                            }
+                        }
+                    }
+                }
+                if(control.currentIndex < 0){
+                    control.currentIndex = 0
+                }
+                d.updateChecked()
+            }
+        }
+    }
+    FluLoader{
+        sourceComponent: control.orientation === Qt.Vertical ? com_vertical : com_horizontal
     }
 }
diff --git a/src/Qt6/imports/FluentUI/Controls/FluRadioButtons.qml b/src/Qt6/imports/FluentUI/Controls/FluRadioButtons.qml
index eb8c817d..5d4ae4aa 100644
--- a/src/Qt6/imports/FluentUI/Controls/FluRadioButtons.qml
+++ b/src/Qt6/imports/FluentUI/Controls/FluRadioButtons.qml
@@ -4,30 +4,76 @@ import QtQuick.Controls.Basic
 import QtQuick.Layouts
 import FluentUI
 
-ColumnLayout {
-    default property alias buttons: control.data
-    property int currentIndex : -1
+Item{
     id:control
-    onCurrentIndexChanged: {
-        for(var i = 0;i<buttons.length;i++){
-            buttons[i].checked = false
-        }
-        var button = buttons[currentIndex]
-        if(button){
-            button.checked = true
+    default property list<QtObject> buttons
+    property int currentIndex : -1
+    property int spacing: 8
+    property int orientation: Qt.Vertical
+    QtObject{
+        id: d
+        function updateChecked(){
+            if(buttons.length === 0){
+                return
+            }
+            for(var i = 0;i<buttons.length;i++){
+                buttons[i].checked = false
+            }
+            buttons[currentIndex].checked = true
         }
     }
-    Component.onCompleted: {
-        for(var i = 0;i<buttons.length;i++){
-            buttons[i].clickListener = function(){
-                for(var i = 0;i<buttons.length;i++){
-                    var button = buttons[i]
-                    if(this === button){
-                        currentIndex = i
+    implicitWidth: childrenRect.width
+    implicitHeight: childrenRect.height
+    onCurrentIndexChanged: {
+        d.updateChecked()
+    }
+    Component{
+        id:com_vertical
+        ColumnLayout {
+            data: control.buttons
+            spacing: control.spacing
+            Component.onCompleted: {
+                for(var i = 0;i<control.buttons.length;i++){
+                    control.buttons[i].clickListener = function(){
+                        for(var i = 0;i<control.buttons.length;i++){
+                            var button = control.buttons[i]
+                            if(this === button){
+                                control.currentIndex = i
+                            }
+                        }
                     }
                 }
+                if(control.currentIndex < 0){
+                    control.currentIndex = 0
+                }
+                d.updateChecked()
             }
         }
-        currentIndex = 0
+    }
+    Component{
+        id:com_horizontal
+        RowLayout {
+            data: buttons
+            spacing: control.spacing
+            Component.onCompleted: {
+                for(var i = 0;i<control.buttons.length;i++){
+                    control.buttons[i].clickListener = function(){
+                        for(var i = 0;i<control.buttons.length;i++){
+                            var button = control.buttons[i]
+                            if(this === button){
+                                control.currentIndex = i
+                            }
+                        }
+                    }
+                }
+                if(control.currentIndex < 0){
+                    control.currentIndex = 0
+                }
+                d.updateChecked()
+            }
+        }
+    }
+    FluLoader{
+        sourceComponent: control.orientation === Qt.Vertical ? com_vertical : com_horizontal
     }
 }