3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-08-08 14:34:01 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

Merge branch '3.2'

Browse source 
Conflicts in Cura.qml and SaveButton.qml from people fixing positioning rounding at the same time...
This commit is contained in:
Ghostkeeper 2018-02-12 13:10:24 +01:00
commit 03b4213e92
No known key found for this signature in database
GPG key ID: 5252B696FB5E7C7A
17 changed files with 46 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

2
resources/qml/Preferences/MaterialView.qml
View file

@ -98,7 +98,7 @@ TabView
Row {
width: scrollView.columnWidth
height: parent.rowHeight
spacing: Math.floor(UM.Theme.getSize("default_margin").width/2)
spacing: Math.floor(UM.Theme.getSize("default_margin").width / 2)
// color indicator square
Rectangle {

4
resources/qml/Preferences/MaterialsPage.qml
View file

@ -59,8 +59,8 @@ UM.ManagementPage
anchors.right: parent.right
Rectangle
{
width: (parent.height * 0.8) | 0
height: (parent.height * 0.8) | 0
width: Math.floor(parent.height * 0.8)
height: Math.floor(parent.height * 0.8)
color: model.metadata.color_code
border.color: isCurrentItem ? palette.highlightedText : palette.text;
anchors.verticalCenter: parent.verticalCenter