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

Merge branch 'CURA-9143_dropdown_item_width' of github.com:Ultimaker/Cura

Browse source
This commit is contained in:
Jaime van Kessel 2022-05-09 14:21:17 +02:00
commit 325bf058e0
2 changed files with 26 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

28
plugins/PrepareStage/PrepareMenu.qml
View file

@ -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

10
resources/qml/Account/UserOperations.qml
View file

@ -90,8 +90,9 @@ Column
Cura.TertiaryButton
{
id: cloudButton
width: UM.Theme.getSize("account_button").width
width: parent.width
height: UM.Theme.getSize("account_button").height
text: "Ultimaker Digital Factory"
onClicked: Qt.openUrlExternally(CuraApplication.ultimakerDigitalFactoryUrl + "?utm_source=cura&utm_medium=software&utm_campaign=menu-visit-DF")
fixedWidthMode: false
@ -100,8 +101,9 @@ Column
Cura.TertiaryButton
{
id: accountButton
width: UM.Theme.getSize("account_button").width
width: parent.width
height: UM.Theme.getSize("account_button").height
text: catalog.i18nc("@button", "Ultimaker Account")
onClicked: Qt.openUrlExternally(CuraApplication.ultimakerCloudAccountRootUrl + "?utm_source=cura&utm_medium=software&utm_campaign=menu-visit-account")
fixedWidthMode: false
@ -117,7 +119,11 @@ Column
Cura.TertiaryButton
{
id: signOutButton
width: parent.width
height: UM.Theme.getSize("account_button").height
onClicked: Cura.API.account.logout()
text: catalog.i18nc("@button", "Sign Out")
fixedWidthMode: false
}
}