mirror of
https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura
synced 2025-08-18 07:25:58 +08:00
Merge branch 'master' of github.com:Ultimaker/Cura
This commit is contained in:
commit
79464106a9
@ -285,10 +285,11 @@ Item
|
|||||||
Cura.MaterialMenu
|
Cura.MaterialMenu
|
||||||
{
|
{
|
||||||
id: materialsMenu
|
id: materialsMenu
|
||||||
|
width: materialSelection.width
|
||||||
extruderIndex: Cura.ExtruderManager.activeExtruderIndex
|
extruderIndex: Cura.ExtruderManager.activeExtruderIndex
|
||||||
updateModels: materialSelection.visible
|
updateModels: materialSelection.visible
|
||||||
}
|
}
|
||||||
onClicked: materialsMenu.popup()
|
onClicked: materialsMenu.popup(0, height - UM.Theme.getSize("default_lining").height)
|
||||||
}
|
}
|
||||||
|
|
||||||
Item
|
Item
|
||||||
@ -341,8 +342,9 @@ Item
|
|||||||
{
|
{
|
||||||
id: nozzlesMenu
|
id: nozzlesMenu
|
||||||
extruderIndex: Cura.ExtruderManager.activeExtruderIndex
|
extruderIndex: Cura.ExtruderManager.activeExtruderIndex
|
||||||
|
width: variantSelection.width
|
||||||
}
|
}
|
||||||
onClicked: nozzlesMenu.popup()
|
onClicked: nozzlesMenu.popup(0, height - UM.Theme.getSize("default_lining").height)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -637,6 +637,8 @@
|
|||||||
|
|
||||||
"banner_icon_size": [2.0, 2.0],
|
"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]
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user