mirror of
https://github.com/Ultimaker/Cura.git
synced 2025-07-16 03:07:53 -06:00
resolve conflict
This commit is contained in:
parent
e7e476cb15
commit
b52bf6decf
17 changed files with 75 additions and 75 deletions
|
@ -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
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue