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

Merge branch '3.0' of github.com:Ultimaker/cura into 3.0

Browse source
This commit is contained in:
A.Sasin 2017-10-12 09:22:52 +02:00
commit a6a58c8c84
29 changed files with 557 additions and 9336 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -108,15 +108,15 @@ TabView
{
width: scrollView.columnWidth;
height: parent.rowHeight;
spacing: UM.Theme.getSize("default_margin").width/2
spacing: Math.floor(UM.Theme.getSize("default_margin").width/2)
Rectangle
{
id: colorSelector
color: properties.color_code
width: (colorLabel.height * 0.75) | 0
height: (colorLabel.height * 0.75) | 0
width: Math.floor(colorLabel.height * 0.75)
height: Math.floor(colorLabel.height * 0.75)
border.width: UM.Theme.getSize("default_lining").height
anchors.verticalCenter: parent.verticalCenter