mirror of
https://github.com/Ultimaker/Cura.git
synced 2025-07-22 06:03:57 -06:00
Added popup spacing by Y coordinate
CURA-5941
This commit is contained in:
parent
ec63e6c130
commit
e6c2238fd5
2 changed files with 12 additions and 5 deletions
|
@ -24,6 +24,9 @@ Item
|
||||||
// How much spacing is needed around the popupItem
|
// How much spacing is needed around the popupItem
|
||||||
property alias popupPadding: popup.padding
|
property alias popupPadding: popup.padding
|
||||||
|
|
||||||
|
// How much spacing is needed for the popupItem by Y coordinate
|
||||||
|
property var popupSpacingY: 0
|
||||||
|
|
||||||
// How much padding is needed around the header & button
|
// How much padding is needed around the header & button
|
||||||
property alias headerPadding: background.padding
|
property alias headerPadding: background.padding
|
||||||
|
|
||||||
|
@ -143,7 +146,7 @@ Item
|
||||||
id: popup
|
id: popup
|
||||||
|
|
||||||
// Ensure that the popup is located directly below the headerItem
|
// Ensure that the popup is located directly below the headerItem
|
||||||
y: headerItemLoader.height + 2 * background.padding
|
y: headerItemLoader.height + 2 * background.padding + popupSpacingY
|
||||||
|
|
||||||
// Make the popup right aligned with the rest. The 3x padding is due to left, right and padding between
|
// Make the popup right aligned with the rest. The 3x padding is due to left, right and padding between
|
||||||
// the button & text.
|
// the button & text.
|
||||||
|
|
|
@ -29,6 +29,7 @@ Cura.ExpandableComponent
|
||||||
iconSource: UM.Theme.getIcon("pencil")
|
iconSource: UM.Theme.getIcon("pencil")
|
||||||
|
|
||||||
popupPadding : 0
|
popupPadding : 0
|
||||||
|
popupSpacingY: 10
|
||||||
|
|
||||||
onCurrentModeIndexChanged: UM.Preferences.setValue("cura/active_mode", currentModeIndex)
|
onCurrentModeIndexChanged: UM.Preferences.setValue("cura/active_mode", currentModeIndex)
|
||||||
|
|
||||||
|
@ -150,10 +151,13 @@ Cura.ExpandableComponent
|
||||||
verticalAlignment: Text.AlignVCenter
|
verticalAlignment: Text.AlignVCenter
|
||||||
color: UM.Theme.getColor("text")
|
color: UM.Theme.getColor("text")
|
||||||
height: parent.height
|
height: parent.height
|
||||||
anchors.topMargin: UM.Theme.getSize("sidebar_margin").height
|
|
||||||
// anchors.bottomMargin: UM.Theme.getSize("sidebar_margin").height
|
anchors
|
||||||
anchors.left: parent.left
|
{
|
||||||
anchors.leftMargin: UM.Theme.getSize("print_setup_selector_margin").height
|
topMargin: UM.Theme.getSize("sidebar_margin").height
|
||||||
|
left: parent.left
|
||||||
|
leftMargin: UM.Theme.getSize("print_setup_selector_margin").height
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
Rectangle
|
Rectangle
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue