GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-08-15 16:16:00 +08:00
Code Issues Packages Projects Releases Wiki Activity

Removed margins and unused arches

Browse Source 
CURA-5941
This commit is contained in:
Aleksei S 2018-11-21 12:50:18 +01:00
parent 4bccd2b7b5
commit bfd8e66657
1 changed files with 22 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
resources/qml/PrintSetupSelector.qml
View File

@ -116,7 +116,6 @@ Cura.ExpandableComponent
} }
} }
Cura.ExtrudersModel Cura.ExtrudersModel
{ {
id: extrudersModel id: extrudersModel
@ -124,7 +123,7 @@ Cura.ExpandableComponent
popupItem: Rectangle popupItem: Rectangle
{ {
property var total_height: popupItemHeader.height + popupItemContent.height + 10 + separator_footer.height property var total_height: popupItemHeader.height + popupItemContent.height + footerControll.height + UM.Theme.getSize("print_setup_selector_margin").height * 2
id: popupItemWrapper id: popupItemWrapper
height: total_height height: total_height
@ -176,7 +175,7 @@ Cura.ExpandableComponent
anchors anchors
{ {
top: popupItemHeader.bottom top: popupItemHeader.bottom
topMargin: 10 topMargin: UM.Theme.getSize("print_setup_selector_margin").height
right: parent.right right: parent.right
left: parent.left left: parent.left
leftMargin: 5 leftMargin: 5
@ -213,7 +212,6 @@ Cura.ExpandableComponent
width: parent.height width: parent.height
height: parent.height height: parent.height
} }
} }
background: Rectangle background: Rectangle
@ -232,11 +230,11 @@ Cura.ExpandableComponent
// overlap bottom border // overlap bottom border
Rectangle Rectangle
{ {
width: parent.width - 4 width: parent.width - UM.Theme.getSize("default_lining").width * 4
height: 4 height: UM.Theme.getSize("default_lining").width * 4
anchors.bottom: parent.bottom anchors.bottom: parent.bottom
anchors.bottomMargin: -2 anchors.bottomMargin: - (UM.Theme.getSize("default_lining").width * 2)
anchors.leftMargin: 2 anchors.leftMargin: UM.Theme.getSize("default_lining").width * 2
anchors.left: parent.left anchors.left: parent.left
} }
@ -249,18 +247,17 @@ Cura.ExpandableComponent
{ {
id: sidebarContents id: sidebarContents
anchors.top: tabBar.bottom anchors.top: tabBar.bottom
anchors.bottom: parent.bottom
anchors.left: parent.left anchors.left: parent.left
anchors.right: parent.right anchors.right: parent.right
height: UM.Theme.getSize("print_setup_widget").height height: UM.Theme.getSize("print_setup_widget").height
border.width: UM.Theme.getSize("default_lining").width * 2 border.width: UM.Theme.getSize("default_lining").width * 2
border.color: UM.Theme.getColor("action_button_border") border.color: UM.Theme.getColor("action_button_border")
SidebarSimple SidebarSimple
{ {
anchors.topMargin: UM.Theme.getSize("print_setup_content_top_margin").height anchors.topMargin: UM.Theme.getSize("print_setup_content_top_margin").height
id: sidebar_simple_id
anchors.fill: parent anchors.fill: parent
visible: currentModeIndex != 1 visible: currentModeIndex != 1
onShowTooltip: base.showTooltip(item, location, text) onShowTooltip: base.showTooltip(item, location, text)
@ -270,25 +267,22 @@ Cura.ExpandableComponent
SidebarAdvanced SidebarAdvanced
{ {
anchors.topMargin: UM.Theme.getSize("print_setup_content_top_margin").height anchors.topMargin: UM.Theme.getSize("print_setup_content_top_margin").height
anchors.bottomMargin: 2 //does not overlap bottom border anchors.bottomMargin: 2 //don't overlap bottom border
anchors.fill: parent anchors.fill: parent
visible: currentModeIndex == 1 visible: currentModeIndex == 1
onShowTooltip: base.showTooltip(item, location, text) onShowTooltip: base.showTooltip(item, location, text)
onHideTooltip: base.hideTooltip() onHideTooltip: base.hideTooltip()
} }
} }
} }
Item Item
{ {
id: separator_footer id: footerControll
anchors.top: popupItemContent.bottom anchors.top: popupItemContent.bottom
anchors.topMargin: 10 anchors.topMargin: UM.Theme.getSize("print_setup_selector_margin").height * 2
width: parent.width width: parent.width
height: settingControlButton.height + 4 height: settingControlButton.height + UM.Theme.getSize("default_lining").height * 4
Rectangle Rectangle
{ {
width: parent.width width: parent.width
@ -299,7 +293,6 @@ Cura.ExpandableComponent
Cura.ActionButton Cura.ActionButton
{ {
id: settingControlButton id: settingControlButton
leftPadding: UM.Theme.getSize("default_margin").width leftPadding: UM.Theme.getSize("default_margin").width
rightPadding: UM.Theme.getSize("default_margin").width rightPadding: UM.Theme.getSize("default_margin").width
height: UM.Theme.getSize("action_panel_button").height height: UM.Theme.getSize("action_panel_button").height
@ -315,10 +308,10 @@ Cura.ExpandableComponent
anchors anchors
{ {
top: parent.top top: parent.top
topMargin: 10 topMargin: UM.Theme.getSize("print_setup_selector_margin").height * 2
bottomMargin: 10 bottomMargin: UM.Theme.getSize("print_setup_selector_margin").height * 2
right: parent.right right: parent.right
rightMargin: 5 rightMargin: UM.Theme.getSize("print_setup_selector_margin").height
} }
onClicked: currentModeIndex = 1 onClicked: currentModeIndex = 1
@ -334,8 +327,6 @@ Cura.ExpandableComponent
textHoverColor: UM.Theme.getColor("text") textHoverColor: UM.Theme.getColor("text")
iconSource: UM.Theme.getIcon("arrow_left") iconSource: UM.Theme.getIcon("arrow_left")
width: UM.Theme.getSize("print_setup_action_button").width width: UM.Theme.getSize("print_setup_action_button").width
fixedWidthMode: true fixedWidthMode: true
visible: currentModeIndex == 1 visible: currentModeIndex == 1
anchors anchors
@ -347,7 +338,14 @@ Cura.ExpandableComponent
leftMargin: UM.Theme.getSize("print_setup_selector_margin").height leftMargin: UM.Theme.getSize("print_setup_selector_margin").height
} }
onClicked: currentModeIndex = 0 // onClicked: currentModeIndex = 0
MouseArea {
anchors.fill: parent
onClicked: {
currentModeIndex = 0
}
}
} }
} }
Component.onCompleted: Component.onCompleted: