From 7520e3b148cbc6db16b75a500cf0c0f0f833ad4f Mon Sep 17 00:00:00 2001 From: Remco Burema Date: Tue, 6 Apr 2021 12:21:59 +0200 Subject: [PATCH] Workaround old-style menu's not closeable on Mac OSX. Menu's didn't always close, and on newer Macs users wouldnt be able to even close the menu, making this a blocker. Will fix this properly before the final, but at least the beta should be usable now. CURA-8142 --- .../ConfigurationMenu/CustomConfiguration.qml | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/resources/qml/Menus/ConfigurationMenu/CustomConfiguration.qml b/resources/qml/Menus/ConfigurationMenu/CustomConfiguration.qml index 7f682c4d2b..30f6d1b68f 100644 --- a/resources/qml/Menus/ConfigurationMenu/CustomConfiguration.qml +++ b/resources/qml/Menus/ConfigurationMenu/CustomConfiguration.qml @@ -289,11 +289,16 @@ Item style: UM.Theme.styles.print_setup_header_button activeFocusOnPress: true - menu: Cura.MaterialMenu + Cura.MaterialMenu { + id: materialsMenu extruderIndex: Cura.ExtruderManager.activeExtruderIndex updateModels: materialSelection.visible } + onClicked: + { + materialsMenu.popup(); + } } Item { @@ -345,7 +350,15 @@ Item activeFocusOnPress: true enabled: enabledCheckbox.checked - menu: Cura.NozzleMenu { extruderIndex: Cura.ExtruderManager.activeExtruderIndex } + Cura.NozzleMenu + { + id: nozzlesMenu + extruderIndex: Cura.ExtruderManager.activeExtruderIndex + } + onClicked: + { + nozzlesMenu.popup(); + } } }