From b7aadbe3c363deed0340e5f20cc762be7efd20e1 Mon Sep 17 00:00:00 2001 From: ChrisTerBeke Date: Wed, 3 Jan 2018 13:08:20 +0100 Subject: [PATCH] Fix extruder dropdown text model --- resources/qml/Settings/SettingComboBox.qml | 2 +- resources/qml/Settings/SettingExtruder.qml | 4 ++-- resources/qml/Settings/SettingOptionalExtruder.qml | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/resources/qml/Settings/SettingComboBox.qml b/resources/qml/Settings/SettingComboBox.qml index 52d0976e76..2f3a13206c 100644 --- a/resources/qml/Settings/SettingComboBox.qml +++ b/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") diff --git a/resources/qml/Settings/SettingExtruder.qml b/resources/qml/Settings/SettingExtruder.qml index 8047231c12..f7b0be69f6 100644 --- a/resources/qml/Settings/SettingExtruder.qml +++ b/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 diff --git a/resources/qml/Settings/SettingOptionalExtruder.qml b/resources/qml/Settings/SettingOptionalExtruder.qml index 85e8c2fac7..b1b11f3b20 100644 --- a/resources/qml/Settings/SettingOptionalExtruder.qml +++ b/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