example/example_en_US.ts

@@ -1700,30 +1700,22 @@ 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="81"/>
+        <location filename="qml/page/T_RadioButton.qml" line="80"/>
-        <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="64"/>
+        <location filename="qml/page/T_RadioButton.qml" line="63"/>
-        <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="68"/>
+        <location filename="qml/page/T_RadioButton.qml" line="67"/>
-        <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="72"/>
+        <location filename="qml/page/T_RadioButton.qml" line="71"/>
-        <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>

example/example_zh_CN.ts

@@ -1808,30 +1808,22 @@ 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="81"/>
+        <location filename="qml/page/T_RadioButton.qml" line="80"/>
-        <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="64"/>
+        <location filename="qml/page/T_RadioButton.qml" line="63"/>
-        <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="68"/>
+        <location filename="qml/page/T_RadioButton.qml" line="67"/>
-        <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="72"/>
+        <location filename="qml/page/T_RadioButton.qml" line="71"/>
-        <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>

example/qml/page/T_RadioButton.qml

@@ -58,7 +58,6 @@ FluScrollablePage{
                 verticalCenter: parent.verticalCenter
                 left: parent.left
             }
-            currentIndex: 1
             FluRadioButton{
                 disabled: radio_button_switch2.checked
                 text: qsTr("Radio Button_1")
@@ -98,110 +97,4 @@ 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"
-    }
-}'
-    }
-
 }

src/FluFrameless.cpp

@@ -271,7 +271,6 @@ void FluFrameless::componentComplete() {
         *result = TRUE;
         return true;
     } else if (uMsg == WM_GETMINMAXINFO) {
-#if (QT_VERSION == QT_VERSION_CHECK(6, 5, 3) || QT_VERSION == QT_VERSION_CHECK(6, 6, 0))
         auto *minmaxInfo = reinterpret_cast<MINMAXINFO *>(lParam);
         auto pixelRatio = window()->devicePixelRatio();
         auto geometry = window()->screen()->availableGeometry();
@@ -281,7 +280,6 @@ void FluFrameless::componentComplete() {
         minmaxInfo->ptMaxPosition.y = rect.top;
         minmaxInfo->ptMaxSize.x = qRound(geometry.width() * pixelRatio);
         minmaxInfo->ptMaxSize.y = qRound(geometry.height() * pixelRatio);
-#endif
         return false;
     } else if (_isWindows11OrGreater && (uMsg == WM_NCLBUTTONDBLCLK || uMsg == WM_NCLBUTTONDOWN)) {
         if (_hitMaximizeButton()) {

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

@@ -3,76 +3,30 @@ import QtQuick.Controls 2.15
 import QtQuick.Layouts 1.15
 import FluentUI 1.0
 
-Item{
+ColumnLayout {
-    id:control
+    default property alias buttons: control.data
-    default property list<QtObject> buttons
     property int currentIndex : -1
-    property int spacing: 8
+    id:control
-    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
-        }
-    }
-    implicitWidth: childrenRect.width
-    implicitHeight: childrenRect.height
     onCurrentIndexChanged: {
-        d.updateChecked()
+        for(var i = 0;i<buttons.length;i++){
-    }
+            buttons[i].checked = false
-    Component{
+        }
-        id:com_vertical
+        var button = buttons[currentIndex]
-        ColumnLayout {
+        if(button){
-            data: control.buttons
+            button.checked = true
-            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()
-            }
         }
     }
-    Component{
+    Component.onCompleted: {
-        id:com_horizontal
+        for(var i = 0;i<buttons.length;i++){
-        RowLayout {
+            buttons[i].clickListener = function(){
-            data: buttons
+                for(var i = 0;i<buttons.length;i++){
-            spacing: control.spacing
+                    var button = buttons[i]
-            Component.onCompleted: {
+                    if(this === button){
-                for(var i = 0;i<control.buttons.length;i++){
+                        currentIndex = 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
-    FluLoader{
-        sourceComponent: control.orientation === Qt.Vertical ? com_vertical : com_horizontal
     }
 }

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

@@ -4,76 +4,30 @@ import QtQuick.Controls.Basic
 import QtQuick.Layouts
 import FluentUI
 
-Item{
+ColumnLayout {
-    id:control
+    default property alias buttons: control.data
-    default property list<QtObject> buttons
     property int currentIndex : -1
-    property int spacing: 8
+    id:control
-    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
-        }
-    }
-    implicitWidth: childrenRect.width
-    implicitHeight: childrenRect.height
     onCurrentIndexChanged: {
-        d.updateChecked()
+        for(var i = 0;i<buttons.length;i++){
-    }
+            buttons[i].checked = false
-    Component{
+        }
-        id:com_vertical
+        var button = buttons[currentIndex]
-        ColumnLayout {
+        if(button){
-            data: control.buttons
+            button.checked = true
-            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()
-            }
         }
     }
-    Component{
+    Component.onCompleted: {
-        id:com_horizontal
+        for(var i = 0;i<buttons.length;i++){
-        RowLayout {
+            buttons[i].clickListener = function(){
-            data: buttons
+                for(var i = 0;i<buttons.length;i++){
-            spacing: control.spacing
+                    var button = buttons[i]
-            Component.onCompleted: {
+                    if(this === button){
-                for(var i = 0;i<control.buttons.length;i++){
+                        currentIndex = 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
-    FluLoader{
-        sourceComponent: control.orientation === Qt.Vertical ? com_vertical : com_horizontal
     }
 }