From b36d040ba972c32b130fc05b6ada599701a34809 Mon Sep 17 00:00:00 2001 From: Lipu Fei Date: Mon, 8 Jul 2019 13:01:39 +0200 Subject: [PATCH 1/2] Use rejected instead of visibility hack CURA-6590 --- resources/qml/Preferences/Materials/MaterialsView.qml | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/resources/qml/Preferences/Materials/MaterialsView.qml b/resources/qml/Preferences/Materials/MaterialsView.qml index 16e9ef9457..da170e1b7f 100644 --- a/resources/qml/Preferences/Materials/MaterialsView.qml +++ b/resources/qml/Preferences/Materials/MaterialsView.qml @@ -107,7 +107,6 @@ TabView property var new_diameter_value: null; property var old_diameter_value: null; property var old_approximate_diameter_value: null; - property bool keyPressed: false onYes: { @@ -122,15 +121,7 @@ TabView diameterSpinBox.value = properties.diameter; } - onVisibilityChanged: - { - if (!visible && !keyPressed) - { - // If the user closes this dialog without clicking on any button, it's the same as clicking "No". - no(); - } - keyPressed = false; - } + onRejected: no() } Label { width: scrollView.columnWidth; height: parent.rowHeight; verticalAlignment: Qt.AlignVCenter; text: catalog.i18nc("@label", "Display Name") } From 3d410cceb9f7b3930aa17c7d85c131f73f3f38c9 Mon Sep 17 00:00:00 2001 From: Lipu Fei Date: Mon, 8 Jul 2019 13:40:03 +0200 Subject: [PATCH 2/2] Fix change material diameter binding CURA-6590 --- resources/qml/Preferences/Materials/MaterialsView.qml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/qml/Preferences/Materials/MaterialsView.qml b/resources/qml/Preferences/Materials/MaterialsView.qml index da170e1b7f..6a6022e56c 100644 --- a/resources/qml/Preferences/Materials/MaterialsView.qml +++ b/resources/qml/Preferences/Materials/MaterialsView.qml @@ -117,8 +117,8 @@ TabView onNo: { - properties.diameter = old_diameter_value; - diameterSpinBox.value = properties.diameter; + base.properties.diameter = old_diameter_value; + diameterSpinBox.value = Qt.binding(function() { return base.properties.diameter }) } onRejected: no()