Browse Source

Fix extruder dropdown text model

ChrisTerBeke 7 years ago
parent
commit
b7aadbe3c3

+ 1 - 1
resources/qml/Settings/SettingComboBox.qml

@@ -77,7 +77,7 @@ SettingItem
             anchors.left: parent.left
             anchors.leftMargin: UM.Theme.getSize("setting_unit_margin").width
             anchors.verticalCenter: parent.verticalCenter
-            anchors.right: parent.left
+            anchors.right: indicator.left
 
             text: control.currentText
             font: UM.Theme.getFont("default")

+ 2 - 2
resources/qml/Settings/SettingExtruder.qml

@@ -154,8 +154,8 @@ SettingItem
 
             contentItem: Text
             {
-                text: modelData.value
-                color: extruderText.color
+                text: model.name
+                color: UM.Theme.getColor("setting_control_text")
                 font: control.font
                 elide: Text.ElideRight
                 verticalAlignment: Text.AlignVCenter

+ 2 - 2
resources/qml/Settings/SettingOptionalExtruder.qml

@@ -173,8 +173,8 @@ SettingItem
 
             contentItem: Text
             {
-                text: modelData.value
-                color: extruderText.color
+                text: model.name
+                color: UM.Theme.getColor("setting_control_text")
                 font: control.font
                 elide: Text.ElideRight
                 verticalAlignment: Text.AlignVCenter