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

@ -483,7 +483,7 @@ UM.MainWindow
anchors
{
horizontalCenter: parent.horizontalCenter
horizontalCenterOffset: -(UM.Theme.getSize("sidebar").width/ 2)
horizontalCenterOffset: -(Math.floor(UM.Theme.getSize("sidebar").width/ 2))
top: parent.verticalCenter;
bottom: parent.bottom;
}