3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-23 06:33:55 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

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

6
resources/qml/Settings/SettingItem.qml
View file

@ -128,12 +128,12 @@ Item {
{
id: settingControls
height: parent.height / 2
spacing: UM.Theme.getSize("sidebar_margin").height / 2
height: Math.floor(parent.height / 2)
spacing: Math.floor(UM.Theme.getSize("sidebar_margin").height / 2)
anchors {
right: controlContainer.left
rightMargin: UM.Theme.getSize("sidebar_margin").width / 2
rightMargin: Math.floor(UM.Theme.getSize("sidebar_margin").width / 2)
verticalCenter: parent.verticalCenter
}