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

Adjust sizes in the custom print setup mode

Browse source 
Contributes to CURA-5941.
This commit is contained in:
Diego Prado Gesto 2018-12-05 13:05:22 +01:00
parent cdb8020029
commit 034b1660f7
3 changed files with 8 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

9
resources/qml/PrintSetupSelector/Custom/CustomPrintSetup.qml
View file

@ -11,9 +11,7 @@ import Cura 1.0 as Cura
Item Item
{ {
id: customPrintSetup id: customPrintSetup
height: childrenRect.height + padding
// TODO: Hardcoded now but UX has to decide about the height of this item
height: 480
property real padding: UM.Theme.getSize("default_margin").width property real padding: UM.Theme.getSize("default_margin").width
property bool multipleExtruders: extrudersModel.count > 1 property bool multipleExtruders: extrudersModel.count > 1
@ -93,16 +91,15 @@ Item
Rectangle Rectangle
{ {
height: UM.Theme.getSize("print_setup_widget").height
anchors anchors
{ {
top: tabBar.visible ? tabBar.bottom : globalProfileRow.bottom top: tabBar.bottom
left: parent.left left: parent.left
leftMargin: parent.padding leftMargin: parent.padding
right: parent.right right: parent.right
rightMargin: parent.padding rightMargin: parent.padding
bottom: parent.bottom
topMargin: -UM.Theme.getSize("default_lining").width topMargin: -UM.Theme.getSize("default_lining").width
bottomMargin: -UM.Theme.getSize("default_lining").width
} }
z: tabBar.z - 1 z: tabBar.z - 1
// Don't show the border when only one extruder // Don't show the border when only one extruder

8
resources/qml/PrintSetupSelector/PrintSetupSelectorContents.qml
View file

@ -28,7 +28,7 @@ Item
{ {
var index = Math.round(UM.Preferences.getValue("cura/active_mode")) var index = Math.round(UM.Preferences.getValue("cura/active_mode"))
if(index != null && !isNaN(index)) if (index != null && !isNaN(index))
{ {
return index return index
} }
@ -150,7 +150,8 @@ Item
{ {
id: buttonsSeparator id: buttonsSeparator
anchors.top: contents.bottom // The buttonsSeparator is inside the contents. This is to avoid a double line in the bottom
anchors.bottom: contents.bottom
width: parent.width width: parent.width
height: UM.Theme.getSize("default_lining").height height: UM.Theme.getSize("default_lining").height
color: UM.Theme.getColor("lining") color: UM.Theme.getColor("lining")
@ -162,10 +163,9 @@ Item
property real padding: UM.Theme.getSize("default_margin").width property real padding: UM.Theme.getSize("default_margin").width
height: childrenRect.height + 2 * padding height: childrenRect.height + 2 * padding
// The buttonsSeparator is inside the buttonRow. This is to avoid some weird behaviours with the scroll bar.
anchors anchors
{ {
top: buttonsSeparator.top top: buttonsSeparator.bottom
left: parent.left left: parent.left
right: parent.right right: parent.right
} }

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

@ -369,7 +369,7 @@
"account_button": [12, 3], "account_button": [12, 3],
"print_setup_widget": [38.0, 42.0], "print_setup_widget": [38.0, 30.0],
"print_setup_mode_toggle": [0.0, 2.0], "print_setup_mode_toggle": [0.0, 2.0],
"print_setup_item": [0.0, 2.0], "print_setup_item": [0.0, 2.0],
"print_setup_extruder_box": [0.0, 6.0], "print_setup_extruder_box": [0.0, 6.0],