Merge branch '3.4' of github.com:Ultimaker/Cura into 3.4

This commit is contained in:
Diego Prado Gesto 2018-06-01 12:59:10 +02:00
commit 0a573408d9

View File

@ -16,7 +16,7 @@ Item
{ {
color: UM.Theme.getColor("lining") color: UM.Theme.getColor("lining")
width: parent.width width: parent.width
height: UM.Theme.getSize("default_lining").height height: Math.floor(UM.Theme.getSize("default_lining").height)
anchors.bottom: parent.bottom anchors.bottom: parent.bottom
} }
Row Row
@ -47,7 +47,7 @@ Item
{ {
text: model.name text: model.name
width: parent.width width: parent.width
height: UM.Theme.getSize("toolbox_property_label").height height: Math.floor(UM.Theme.getSize("toolbox_property_label").height)
wrapMode: Text.WordWrap wrapMode: Text.WordWrap
font: UM.Theme.getFont("default_bold") font: UM.Theme.getFont("default_bold")
color: pluginInfo.color color: pluginInfo.color
@ -81,7 +81,7 @@ Item
} }
} }
width: parent.width width: parent.width
height: UM.Theme.getSize("toolbox_property_label").height height: Math.floor(UM.Theme.getSize("toolbox_property_label").height)
wrapMode: Text.WordWrap wrapMode: Text.WordWrap
verticalAlignment: Text.AlignVCenter verticalAlignment: Text.AlignVCenter
horizontalAlignment: Text.AlignLeft horizontalAlignment: Text.AlignLeft