3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-18 20:28:01 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

resolve conflict

Browse source
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
Download patch file Download diff file Expand all files Collapse all files

4
resources/qml/Settings/SettingCategory.qml
View file

@ -193,7 +193,7 @@ Button
anchors {
right: inheritButton.visible ? inheritButton.left : parent.right
// use 1.9 as the factor because there is a 0.1 difference between the settings and inheritance warning icons
rightMargin: inheritButton.visible ? UM.Theme.getSize("default_margin").width / 2 : category_arrow.width + UM.Theme.getSize("default_margin").width * 1.9
rightMargin: inheritButton.visible ? Math.floor(UM.Theme.getSize("default_margin").width / 2) : category_arrow.width + Math.floor(UM.Theme.getSize("default_margin").width * 1.9)
verticalCenter: parent.verticalCenter
}
@ -231,7 +231,7 @@ Button
return false
}
height: parent.height / 2
height: Math.floor(parent.height / 2)
width: height
onClicked: