From f1d75fe827f94d5551a34b86facc4cd9dba2659f Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Mon, 9 May 2022 11:54:28 +0200 Subject: [PATCH] Set the width of model loading drop-down to the max of all elements Then set the elements to be equal to that width, so they fill the complete width of the drop-down. Contributes to issue CURA-9143. --- plugins/PrepareStage/PrepareMenu.qml | 28 ++++++++++++++++++---------- 1 file changed, 18 insertions(+), 10 deletions(-) diff --git a/plugins/PrepareStage/PrepareMenu.qml b/plugins/PrepareStage/PrepareMenu.qml index d6bff1792e..42c3c8dde6 100644 --- a/plugins/PrepareStage/PrepareMenu.qml +++ b/plugins/PrepareStage/PrepareMenu.qml @@ -106,26 +106,34 @@ Item { id: openProviderColumn - //The column doesn't automatically listen to its children rect if the children change internally, so we need to explicitly update the size. - onChildrenRectChanged: + // Automatically set the width to fit the widest MenuItem + // Based on https://martin.rpdev.net/2018/03/13/qt-quick-controls-2-automatically-set-the-width-of-menus.html + function setWidth() { - popup.implicitHeight = childrenRect.height - popup.implicitWidth = childrenRect.width - } - onPositioningComplete: - { - popup.implicitHeight = childrenRect.height - popup.implicitWidth = childrenRect.width + var result = 0; + var padding = 0; + for (var i = 0; i < fileProviderRepeater.count; ++i) { + var item = fileProviderRepeater.itemAt(i); + if (item.hasOwnProperty("implicitWidth")) + { + var itemWidth = item.implicitWidth; + result = Math.max(itemWidth, result); + padding = Math.max(item.padding, padding); + } + } + return result + padding * 2; } + width: setWidth() Repeater { + id: fileProviderRepeater model: prepareMenu.fileProviderModel delegate: Button { leftPadding: UM.Theme.getSize("default_margin").width rightPadding: UM.Theme.getSize("default_margin").width - width: contentItem.width + leftPadding + rightPadding + width: openProviderColumn.width height: UM.Theme.getSize("action_button").height hoverEnabled: true