resolve conflict

This commit is contained in:
Mark 2018-02-09 11:30:56 +01:00
parent e7e476cb15
commit b52bf6decf
17 changed files with 75 additions and 75 deletions

View file

@ -61,7 +61,7 @@ SettingItem
{
id: downArrow
x: control.width - width - control.rightPadding
y: control.topPadding + (control.availableHeight - height) / 2
y: control.topPadding + Math.floor((control.availableHeight - height) / 2)
source: UM.Theme.getIcon("arrow_bottom")
width: UM.Theme.getSize("standard_arrow").width