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

Fix an issues that didn't calculate the correct height of the popup when the custom mode was selected from previous runs.

Browse source 
Contributes to CURA-5941.
This commit is contained in:
Diego Prado Gesto 2018-12-04 12:07:31 +01:00
parent a66bb4fab1
commit 692686597c
2 changed files with 48 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

42
resources/qml/ExpandableComponent.qml
View file

@ -25,10 +25,7 @@ Item
property alias headerItem: headerItemLoader.sourceComponent
// The popupItem holds the QML item that is shown when the "open" button is pressed
property var popupItem
// The popupItem holds the QML item that is shown when the "open" button is pressed
property var componentItem
property alias popupItem: popup.contentItem
property color popupBackgroundColor: UM.Theme.getColor("action_button")
@ -87,23 +84,6 @@ Item
}
}
onPopupItemChanged:
{
// Since we want the size of the popup to be set by the size of the content,
// we need to do it like this.
popup.width = popupItem.width + 2 * popup.padding
popup.height = popupItem.height + 2 * popup.padding
popup.contentItem = popupItem
}
Connections
{
// Since it could be that the popup is dynamically populated, we should also take these changes into account.
target: popupItem
onWidthChanged: popup.width = popupItem.width + 2 * popup.padding
onHeightChanged: popup.height = popupItem.height + 2 * popup.padding
}
implicitHeight: 100 * screenScaleFactor
implicitWidth: 400 * screenScaleFactor
@ -202,5 +182,25 @@ Item
border.color: UM.Theme.getColor("lining")
radius: UM.Theme.getSize("default_radius").width
}
contentItem: Item { }
onContentItemChanged:
{
// Since we want the size of the popup to be set by the size of the content,
// we need to do it like this.
popup.width = contentItem.width + 2 * popup.padding
popup.height = contentItem.height + 2 * popup.padding
}
}
// DO NOT MOVE UP IN THE CODE: This connection has to be here, after the definition of the Popup item.
// Apparently the order in which these are handled matters and so the height is correctly updated if this is here.
Connections
{
// Since it could be that the popup is dynamically populated, we should also take these changes into account.
target: popup.contentItem
onWidthChanged: popup.width = popup.contentItem.width + 2 * popup.padding
onHeightChanged: popup.height = popup.contentItem.height + 2 * popup.padding
}
}