Merge remote-tracking branch 'origin/ui_rework_4_0' into CURA-5941_restyle_setting_dropdown

This commit is contained in:
Lipu Fei 2018-12-06 11:09:26 +01:00
commit 109586f69c
2 changed files with 2 additions and 2 deletions

View file

@ -10,7 +10,7 @@ import Cura 1.0 as Cura
Item
{
width: parent.width
height: visible ? childrenRect.height : 0
height: childrenRect.height
Label
{

View file

@ -17,7 +17,7 @@ Item
}
width: parent.width
height: visible ? childrenRect.height : 0
height: childrenRect.height
Label
{