Merge branch 'master' of github.com:Ultimaker/Cura

This commit is contained in:
Jaime van Kessel 2022-03-08 14:27:43 +01:00
commit 79464106a9
2 changed files with 7 additions and 3 deletions

View File

@ -285,10 +285,11 @@ Item
Cura.MaterialMenu
{
id: materialsMenu
width: materialSelection.width
extruderIndex: Cura.ExtruderManager.activeExtruderIndex
updateModels: materialSelection.visible
}
onClicked: materialsMenu.popup()
onClicked: materialsMenu.popup(0, height - UM.Theme.getSize("default_lining").height)
}
Item
@ -341,8 +342,9 @@ Item
{
id: nozzlesMenu
extruderIndex: Cura.ExtruderManager.activeExtruderIndex
width: variantSelection.width
}
onClicked: nozzlesMenu.popup()
onClicked: nozzlesMenu.popup(0, height - UM.Theme.getSize("default_lining").height)
}
}

View File

@ -637,6 +637,8 @@
"banner_icon_size": [2.0, 2.0],
"marketplace_large_icon": [4.0, 4.0]
"marketplace_large_icon": [4.0, 4.0],
"preferences_page_list_item": [8.0, 2.0]
}
}