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

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

10
resources/qml/Settings/SettingTextField.qml
View file

@ -26,7 +26,7 @@ SettingItem
anchors.fill: parent
border.width: Math.floor(UM.Theme.getSize("default_lining").width)
border.width: Math.round(UM.Theme.getSize("default_lining").width)
border.color:
{
if(!enabled)
@ -76,7 +76,7 @@ SettingItem
Rectangle
{
anchors.fill: parent;
anchors.margins: Math.floor(UM.Theme.getSize("default_lining").width);
anchors.margins: Math.round(UM.Theme.getSize("default_lining").width);
color: UM.Theme.getColor("setting_control_highlight")
opacity: !control.hovered ? 0 : propertyProvider.properties.validationState == "ValidatorState.Valid" ? 1.0 : 0.35;
}
@ -84,7 +84,7 @@ SettingItem
Label
{
anchors.right: parent.right;
anchors.rightMargin: Math.floor(UM.Theme.getSize("setting_unit_margin").width)
anchors.rightMargin: Math.round(UM.Theme.getSize("setting_unit_margin").width)
anchors.verticalCenter: parent.verticalCenter;
text: definition.unit;
@ -107,9 +107,9 @@ SettingItem
anchors
{
left: parent.left
leftMargin: Math.floor(UM.Theme.getSize("setting_unit_margin").width)
leftMargin: Math.round(UM.Theme.getSize("setting_unit_margin").width)
right: parent.right
rightMargin: Math.floor(UM.Theme.getSize("setting_unit_margin").width)
rightMargin: Math.round(UM.Theme.getSize("setting_unit_margin").width)
verticalCenter: parent.verticalCenter
}
renderType: Text.NativeRendering