Merge branch 'master'

This commit is contained in:
Lipu Fei 2017-09-14 12:48:07 +02:00
commit ccebadee10
16 changed files with 731 additions and 135 deletions

View file

@ -519,8 +519,8 @@ Item
anchors.horizontalCenter: parent.horizontalCenter
radius: parent.handleRadius
color: parent.lowerHandleColor
border.width: UM.Theme.getSize("default_lining").width
border.color: UM.Theme.getColor("slider_handle_border")
// border.width: UM.Theme.getSize("default_lining").width
// border.color: UM.Theme.getColor("slider_handle_border")
visible: slider.layersVisible