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

Change margins

Browse source 
Instead of using multiplications and divisions, just use the corresponding margins.

Contributes to CURA-5876.
This commit is contained in:
Diego Prado Gesto 2018-12-10 15:34:48 +01:00
parent aa376e60da
commit 1cd0d26db4
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
resources/qml/Menus/ConfigurationMenu/ConfigurationItem.qml
View file

@ -29,7 +29,7 @@ Button
id: contentColumn id: contentColumn
width: parent.width width: parent.width
padding: UM.Theme.getSize("wide_margin").width padding: UM.Theme.getSize("wide_margin").width
spacing: Math.round(UM.Theme.getSize("default_margin").height / 2) spacing: UM.Theme.getSize("narrow_margin").height
Row Row
{ {

6
resources/qml/Menus/ConfigurationMenu/ConfigurationListView.qml
View file

@ -12,7 +12,7 @@ Column
id: base id: base
property var outputDevice: null property var outputDevice: null
height: childrenRect.height + 2 * padding height: childrenRect.height + 2 * padding
spacing: Math.round(UM.Theme.getSize("default_margin").height / 2) spacing: UM.Theme.getSize("narrow_margin").height
function forceModelUpdate() function forceModelUpdate()
{ {
@ -55,7 +55,7 @@ Column
ListView ListView
{ {
id: configurationList id: configurationList
spacing: Math.round(UM.Theme.getSize("default_margin").height / 2) spacing: UM.Theme.getSize("narrow_margin").height
width: container.width - ((height > container.maximumHeight) ? container.ScrollBar.vertical.background.width : 0) //Make room for scroll bar if there is any. width: container.width - ((height > container.maximumHeight) ? container.ScrollBar.vertical.background.width : 0) //Make room for scroll bar if there is any.
contentHeight: childrenRect.height contentHeight: childrenRect.height
height: childrenRect.height height: childrenRect.height
@ -64,7 +64,7 @@ Column
section.criteria: ViewSection.FullString section.criteria: ViewSection.FullString
section.delegate: Item section.delegate: Item
{ {
height: printerTypeLabel.height + UM.Theme.getSize("default_margin").height * 2 //Causes a default margin above the label and a default margin below the label. height: printerTypeLabel.height + UM.Theme.getSize("wide_margin").height //Causes a default margin above the label and a default margin below the label.
Cura.PrinterTypeLabel Cura.PrinterTypeLabel
{ {
id: printerTypeLabel id: printerTypeLabel