Merge branch 'CURA-6033_unknown_material' of github.com:Ultimaker/Cura into 4.0

This commit is contained in:
Jaime van Kessel 2018-12-31 10:33:01 +01:00
commit c08339e191
2 changed files with 99 additions and 5 deletions

View file

@ -163,9 +163,9 @@ Item
id: rangleHandleLabel
height: sliderRoot.handleSize + UM.Theme.getSize("default_margin").height
x: parent.x + parent.width + UM.Theme.getSize("default_margin").width
x: parent.x - width - UM.Theme.getSize("default_margin").width
anchors.verticalCenter: parent.verticalCenter
target: Qt.point(sliderRoot.width + width, y + height / 2)
target: Qt.point(sliderRoot.width, y + height / 2)
visible: sliderRoot.activeHandle == parent
// custom properties