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

Merge branch 'qt6_beyond_the_splash' of github.com:Ultimaker/Cura into qt6_beyond_the_splash

Browse Source
This commit is contained in:
Jaime van Kessel 2022-04-01 13:16:46 +02:00
commit eb4e27dd30
2 changed files with 2 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
resources/qml/ExpandableComponent.qml
View File

@ -305,14 +305,6 @@ Item
padding: UM.Theme.getSize("default_margin").width padding: UM.Theme.getSize("default_margin").width
contentItem: Item {} contentItem: Item {}
onContentItemChanged:
{
// Since we want the size of the content to be set by the size of the content,
// we need to do it like this.
content.width = contentItem.width + 2 * content.padding
content.height = contentItem.height + 2 * content.padding
}
} }
} }
@ -322,10 +314,8 @@ Item
{ {
// Since it could be that the content is dynamically populated, we should also take these changes into account. // Since it could be that the content is dynamically populated, we should also take these changes into account.
target: content.contentItem target: content.contentItem
function onWidthChanged() { content.width = content.contentItem.width + 2 * content.padding }
function onHeightChanged() function onHeightChanged()
{ {
content.height = content.contentItem.height + 2 * content.padding
contentContainer.height = contentHeader.height + content.height contentContainer.height = contentHeader.height + content.height
} }
} }

5
resources/qml/PrintSetupSelector/PrintSetupSelectorContents.qml
View File

@ -15,9 +15,8 @@ Item
id: content id: content
property int absoluteMinimumHeight: 200 * screenScaleFactor property int absoluteMinimumHeight: 200 * screenScaleFactor
implicitWidth: UM.Theme.getSize("print_setup_widget").width - 2 * UM.Theme.getSize("default_margin").width
width: UM.Theme.getSize("print_setup_widget").width - 2 * UM.Theme.getSize("default_margin").width implicitHeight: contents.height + buttonRow.height
height: contents.height + buttonRow.height
enum Mode enum Mode
{ {