Merge branch 'main' of https://github.com/zhuzichu520/FluentUI

example/qml-Qt6/page/T_ComboBox.qml

@@ -32,6 +32,30 @@ FluScrollablePage{
         }
     }
 
+    FluArea {
+        Layout.fillWidth: true
+        height: 80
+        paddings: 5
+        Layout.topMargin: 20
+        Column{
+            spacing: 5
+            anchors.verticalCenter: parent.verticalCenter
+            FluText{
+                text: "disabled=true"
+                x:10
+            }
+            FluComboBox {
+                disabled: true
+                model: ListModel {
+                    id: model_2
+                    ListElement { text: "Banana" }
+                    ListElement { text: "Apple" }
+                    ListElement { text: "Coconut" }
+                }
+            }
+        }
+    }
+
     FluArea{
         Layout.fillWidth: true
         height: 80
@@ -47,14 +71,14 @@ FluScrollablePage{
             FluComboBox {
                 editable: true
                 model: ListModel {
-                    id: model_2
+                    id: model_3
                     ListElement { text: "Banana" }
                     ListElement { text: "Apple" }
                     ListElement { text: "Coconut" }
                 }
                 onAccepted: {
                     if (find(editText) === -1)
-                        model_2.append({text: editText})
+                        model_3.append({text: editText})
                 }
             }
         }

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

@@ -52,7 +52,12 @@ T.ComboBox {
         autoScroll: control.editable
         font:control.font
         readOnly: control.down
-        color: FluTheme.dark ?  Qt.rgba(255/255,255/255,255/255,1) : Qt.rgba(27/255,27/255,27/255,1)
+        color: {
+            if(control.disabled) {
+                return FluTheme.dark ? Qt.rgba(131/255,131/255,131/255,1) : Qt.rgba(160/255,160/255,160/255,1)
+            }
+            return FluTheme.dark ?  Qt.rgba(255/255,255/255,255/255,1) : Qt.rgba(27/255,27/255,27/255,1)
+        }
         inputMethodHints: control.inputMethodHints
         validator: control.validator
         selectByMouse: true