Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/Ultimaker/Cura.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'resources/qml/Settings/SettingExtruder.qml')
-rw-r--r--resources/qml/Settings/SettingExtruder.qml16
1 files changed, 6 insertions, 10 deletions
diff --git a/resources/qml/Settings/SettingExtruder.qml b/resources/qml/Settings/SettingExtruder.qml
index 995e1103f3..ea514eb069 100644
--- a/resources/qml/Settings/SettingExtruder.qml
+++ b/resources/qml/Settings/SettingExtruder.qml
@@ -77,7 +77,7 @@ SettingItem
currentIndex: propertyProvider.properties.value !== undefined ? propertyProvider.properties.value : 0
- property string color: "#fff"
+ property string color: "transparent"
Binding
{
@@ -85,7 +85,7 @@ SettingItem
// explicit binding here otherwise we do not handle value changes after the model changes.
target: control
property: "color"
- value: control.currentText != "" ? control.model.getItem(control.currentIndex).color : ""
+ value: control.currentText != "" ? control.model.getItem(control.currentIndex).color : "transparent"
}
Binding
@@ -160,18 +160,16 @@ SettingItem
elide: Text.ElideLeft
verticalAlignment: Text.AlignVCenter
- background: UM.RecolorImage
+ background: Rectangle
{
id: swatch
height: Math.round(parent.height / 2)
width: height
+ radius: Math.round(width / 2)
anchors.right: parent.right
anchors.verticalCenter: parent.verticalCenter
anchors.rightMargin: UM.Theme.getSize("thin_margin").width
- sourceSize.width: width
- sourceSize.height: height
- source: UM.Theme.getIcon("Extruder", "medium")
color: control.color
}
}
@@ -229,18 +227,16 @@ SettingItem
verticalAlignment: Text.AlignVCenter
rightPadding: swatch.width + UM.Theme.getSize("setting_unit_margin").width
- background: UM.RecolorImage
+ background: Rectangle
{
id: swatch
height: Math.round(parent.height / 2)
width: height
+ radius: Math.round(width / 2)
anchors.right: parent.right
anchors.verticalCenter: parent.verticalCenter
anchors.rightMargin: UM.Theme.getSize("thin_margin").width
- sourceSize.width: width
- sourceSize.height: height
- source: UM.Theme.getIcon("Extruder", "medium")
color: control.model.getItem(index).color
}
}