From b2b258d35755844ea66fbbc071a2641cc1cd1b75 Mon Sep 17 00:00:00 2001 From: Kostas Karmas Date: Tue, 6 Apr 2021 14:53:20 +0200 Subject: Fix add script button list not working in MacOS Fixed by using the qt quick controls 2 CURA-8127 --- plugins/PostProcessingPlugin/PostProcessingPlugin.qml | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/plugins/PostProcessingPlugin/PostProcessingPlugin.qml b/plugins/PostProcessingPlugin/PostProcessingPlugin.qml index 743e149866..2b3a141aa0 100644 --- a/plugins/PostProcessingPlugin/PostProcessingPlugin.qml +++ b/plugins/PostProcessingPlugin/PostProcessingPlugin.qml @@ -3,7 +3,9 @@ import QtQuick 2.2 import QtQuick.Controls 1.1 +import QtQuick.Controls 2.15 as QQC2 import QtQuick.Controls.Styles 1.1 +import QtQml.Models 2.15 as Models import QtQuick.Layouts 1.1 import QtQuick.Dialogs 1.1 import QtQuick.Window 2.2 @@ -235,7 +237,7 @@ UM.Dialog anchors.leftMargin: base.textMargin anchors.top: activeScriptsList.bottom anchors.topMargin: base.textMargin - menu: scriptsMenu + onClicked: scriptsMenu.open() style: ButtonStyle { label: Label @@ -244,15 +246,16 @@ UM.Dialog } } } - Menu + QQC2.Menu { id: scriptsMenu + width: parent.width - Instantiator + Models.Instantiator { model: manager.loadedScriptList - MenuItem + QQC2.MenuItem { text: manager.getScriptLabelByKey(modelData.toString()) onTriggered: manager.addScriptToList(modelData.toString()) @@ -422,7 +425,7 @@ UM.Dialog tooltip.target.x = position.x + 1 } - onHideTooltip: tooltip.hide() + function onHideTooltip() { tooltip.hide() } } } } -- cgit v1.2.3