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

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

14
resources/qml/Settings/SettingExtruder.qml
View file

@ -68,7 +68,7 @@ SettingItem
{
id: downArrow
x: control.width - width - control.rightPadding
y: control.topPadding + Math.floor((control.availableHeight - height) / 2)
y: control.topPadding + Math.round((control.availableHeight - height) / 2)
source: UM.Theme.getIcon("arrow_bottom")
width: UM.Theme.getSize("standard_arrow").width
@ -126,16 +126,16 @@ SettingItem
background: Rectangle
{
id: swatch
height: Math.floor(UM.Theme.getSize("setting_control").height / 2)
height: Math.round(UM.Theme.getSize("setting_control").height / 2)
width: height
anchors.right: parent.right
anchors.verticalCenter: parent.verticalCenter
anchors.margins: Math.floor(UM.Theme.getSize("default_margin").width / 4)
anchors.margins: Math.round(UM.Theme.getSize("default_margin").width / 4)
border.width: UM.Theme.getSize("default_lining").width
border.color: enabled ? UM.Theme.getColor("setting_control_border") : UM.Theme.getColor("setting_control_disabled_border")
radius: Math.floor(width / 2)
radius: Math.round(width / 2)
color: control.color
}
@ -180,16 +180,16 @@ SettingItem
background: Rectangle
{
id: swatch
height: Math.floor(UM.Theme.getSize("setting_control").height / 2)
height: Math.round(UM.Theme.getSize("setting_control").height / 2)
width: height
anchors.right: parent.right
anchors.verticalCenter: parent.verticalCenter
anchors.margins: Math.floor(UM.Theme.getSize("default_margin").width / 4)
anchors.margins: Math.round(UM.Theme.getSize("default_margin").width / 4)
border.width: UM.Theme.getSize("default_lining").width
border.color: enabled ? UM.Theme.getColor("setting_control_border") : UM.Theme.getColor("setting_control_disabled_border")
radius: Math.floor(width / 2)
radius: Math.round(width / 2)
color: control.model.getItem(index).color
}