Merge branch '2.7'

This commit is contained in:
Ghostkeeper 2017-08-07 11:06:12 +02:00
commit 80cbdd03bb
No known key found for this signature in database
GPG key ID: C5F96EE2BC0F7E75
6 changed files with 243 additions and 242 deletions

View file

@ -205,7 +205,7 @@ Item
Layout.preferredHeight: UM.Theme.getSize("layerview_row").height + UM.Theme.getSize("default_lining").height
Layout.preferredWidth: UM.Theme.getSize("layerview_row").width
style: UM.Theme.styles.checkbox
Text
Label
{
text: model.name
elide: Text.ElideRight
@ -272,7 +272,7 @@ Item
Layout.preferredHeight: UM.Theme.getSize("layerview_row").height + UM.Theme.getSize("default_lining").height
Layout.preferredWidth: UM.Theme.getSize("layerview_row").width
style: UM.Theme.styles.checkbox
Text
Label
{
text: label
elide: Text.ElideRight