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

Tweak simulation view panel margins

Browse source
This commit is contained in:
fieldOfView 2017-11-20 17:49:00 +01:00
parent 1483683992
commit a42d054505
2 changed files with 7 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

16
plugins/SimulationView/SimulationView.qml
View file

@ -70,9 +70,9 @@ Item
anchors.topMargin: UM.Theme.getSize("default_margin").height anchors.topMargin: UM.Theme.getSize("default_margin").height
anchors.left: parent.left anchors.left: parent.left
anchors.leftMargin: UM.Theme.getSize("default_margin").width anchors.leftMargin: UM.Theme.getSize("default_margin").width
spacing: UM.Theme.getSize("layerview_row_spacing").height
anchors.right: parent.right anchors.right: parent.right
anchors.rightMargin: UM.Theme.getSize("default_margin").width anchors.rightMargin: UM.Theme.getSize("default_margin").width
spacing: UM.Theme.getSize("layerview_row_spacing").height
Label Label
{ {
@ -120,7 +120,6 @@ Item
visible: !UM.SimulationView.compatibilityMode visible: !UM.SimulationView.compatibilityMode
style: UM.Theme.styles.combobox style: UM.Theme.styles.combobox
anchors.right: parent.right anchors.right: parent.right
anchors.rightMargin: 10 * screenScaleFactor
onActivated: onActivated:
{ {
@ -154,12 +153,10 @@ Item
Layout.preferredWidth: UM.Theme.getSize("layerview_row").width Layout.preferredWidth: UM.Theme.getSize("layerview_row").width
} }
Label Item
{ {
id: space2Label height: Math.floor(UM.Theme.getSize("default_margin").width / 2)
anchors.left: parent.left width: width
text: " "
font.pointSize: 0.5
} }
Connections { Connections {
@ -192,7 +189,6 @@ Item
Rectangle { Rectangle {
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
anchors.right: extrudersModelCheckBox.right anchors.right: extrudersModelCheckBox.right
anchors.rightMargin: UM.Theme.getSize("default_margin").width
width: UM.Theme.getSize("layerview_legend_size").width width: UM.Theme.getSize("layerview_legend_size").width
height: UM.Theme.getSize("layerview_legend_size").height height: UM.Theme.getSize("layerview_legend_size").height
color: model.color color: model.color
@ -261,7 +257,6 @@ Item
Rectangle { Rectangle {
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
anchors.right: legendModelCheckBox.right anchors.right: legendModelCheckBox.right
anchors.rightMargin: UM.Theme.getSize("default_margin").width
width: UM.Theme.getSize("layerview_legend_size").width width: UM.Theme.getSize("layerview_legend_size").width
height: UM.Theme.getSize("layerview_legend_size").height height: UM.Theme.getSize("layerview_legend_size").height
color: UM.Theme.getColor(model.colorId) color: UM.Theme.getColor(model.colorId)
@ -330,7 +325,6 @@ Item
Rectangle { Rectangle {
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
anchors.right: typesLegendModelLabel.right anchors.right: typesLegendModelLabel.right
anchors.rightMargin: UM.Theme.getSize("default_margin").width
width: UM.Theme.getSize("layerview_legend_size").width width: UM.Theme.getSize("layerview_legend_size").width
height: UM.Theme.getSize("layerview_legend_size").height height: UM.Theme.getSize("layerview_legend_size").height
color: UM.Theme.getColor(model.colorId) color: UM.Theme.getColor(model.colorId)
@ -347,7 +341,7 @@ Item
} }
// Text for the minimum, maximum and units for the feedrates and layer thickness // Text for the minimum, maximum and units for the feedrates and layer thickness
Rectangle { Item {
id: gradientLegend id: gradientLegend
visible: view_settings.show_gradient visible: view_settings.show_gradient
width: parent.width width: parent.width

4
resources/themes/cura-light/theme.json
View file

@ -346,8 +346,8 @@
"slider_layerview_background": [4.0, 0.0], "slider_layerview_background": [4.0, 0.0],
"slider_layerview_margin": [1.0, 1.5], "slider_layerview_margin": [1.0, 1.5],
"layerview_menu_size": [15, 19.5], "layerview_menu_size": [15, 20],
"layerview_menu_size_material_color_mode": [15, 15.5], "layerview_menu_size_material_color_mode": [15, 16],
"layerview_menu_size_compatibility": [22, 22.0], "layerview_menu_size_compatibility": [22, 22.0],
"layerview_legend_size": [1.0, 1.0], "layerview_legend_size": [1.0, 1.0],
"layerview_row": [11.0, 1.5], "layerview_row": [11.0, 1.5],