Merge branch 'master' into ui_rework_4_0

This commit is contained in:
Diego Prado Gesto 2018-11-09 08:53:31 +01:00
commit 7a12cc53cc
61 changed files with 14245 additions and 53399 deletions

View file

@ -48,7 +48,7 @@ UM.PointingRectangle {
horizontalCenter: parent.horizontalCenter
}
width: (maximumValue.toString().length + 1) * 10 * screenScaleFactor
width: ((maximumValue + 1).toString().length + 1) * 10 * screenScaleFactor
text: sliderLabelRoot.value + startFrom // the current handle value, add 1 because layers is an array
horizontalAlignment: TextInput.AlignRight