Layout fixes for controls 2.0

This commit is contained in:
ChrisTerBeke 2018-01-03 11:46:20 +01:00
parent 27ca743e58
commit 77c8ac3950
3 changed files with 44 additions and 25 deletions

View file

@ -132,8 +132,10 @@ SettingItem
Label
{
id: extruderText
anchors.verticalCenter: parent.verticalCenter
anchors.left: parent.left
anchors.leftMargin: UM.Theme.getSize("setting_unit_margin").width
anchors.right: swatch.left
text: control.currentText
@ -143,6 +145,7 @@ SettingItem
elide: Text.ElideRight
verticalAlignment: Text.AlignVCenter
}
Rectangle
{
id: swatch
@ -150,9 +153,11 @@ SettingItem
width: height
anchors.right: parent.right
anchors.rightMargin: control.indicator.width + control.spacing
anchors.rightMargin: control.indicator.width + UM.Theme.getSize("setting_unit_margin").width
anchors.verticalCenter: parent.verticalCenter
anchors.margins: UM.Theme.getSize("default_margin").width / 4
border.width: UM.Theme.getSize("default_lining").width * 2
border.width: UM.Theme.getSize("default_lining").width
border.color: enabled ? UM.Theme.getColor("setting_control_border") : UM.Theme.getColor("setting_control_disabled_border")
radius: width / 2