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

Merge branch '3.2'

Browse source 
Lots of conflicts due to rounding vs. flooring of text element positions for weirdness with the font aliasing.
This commit is contained in:
Ghostkeeper 2018-02-14 10:53:51 +01:00
commit ee9de1f11b
No known key found for this signature in database
GPG key ID: 5252B696FB5E7C7A
48 changed files with 999 additions and 875 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1,9 +1,9 @@
// Copyright (c) 2017 Ultimaker B.V.
// Copyright (c) 2018 Ultimaker B.V.
// Cura is released under the terms of the LGPLv3 or higher.
import QtQuick 2.7
import QtQuick.Layouts 1.1
import QtQuick.Controls 2.0
import QtQuick 2.8
import QtQuick.Layouts 1.2
import QtQuick.Controls 2.1
import UM 1.1 as UM
import Cura 1.0 as Cura
@ -108,7 +108,7 @@ Item {
id: label;
anchors.left: parent.left;
anchors.leftMargin: doDepthIndentation ? Math.floor((UM.Theme.getSize("section_icon_column").width + 5) + ((definition.depth - 1) * UM.Theme.getSize("setting_control_depth_margin").width)) : 0
anchors.leftMargin: doDepthIndentation ? Math.round((UM.Theme.getSize("section_icon_column").width + 5) + ((definition.depth - 1) * UM.Theme.getSize("setting_control_depth_margin").width)) : 0
anchors.right: settingControls.left;
anchors.verticalCenter: parent.verticalCenter
@ -128,12 +128,12 @@ Item {
{
id: settingControls
height: Math.floor(parent.height / 2)
spacing: Math.floor(UM.Theme.getSize("sidebar_margin").height / 2)
height: Math.round(parent.height / 2)
spacing: Math.round(UM.Theme.getSize("sidebar_margin").height / 2)
anchors {
right: controlContainer.left
rightMargin: Math.floor(UM.Theme.getSize("sidebar_margin").width / 2)
rightMargin: Math.round(UM.Theme.getSize("sidebar_margin").width / 2)
verticalCenter: parent.verticalCenter
}