Merge branch 'master' into feature_setting_visibility_profiles

# Conflicts:
#	resources/qml/Settings/SettingView.qml
This commit is contained in:
fieldOfView 2018-02-15 11:54:45 +01:00
commit a17160f52d
129 changed files with 1937 additions and 1538 deletions

View file

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