GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-08-13 04:19:03 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'CURA-6590_continue_fix_diameter_reset'

Browse Source
This commit is contained in:
Ghostkeeper 2019-07-09 09:11:31 +02:00
commit b87a0a7e82
No known key found for this signature in database
GPG Key ID: 86BEF881AE2CF276
1 changed files with 3 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
resources/qml/Preferences/Materials/MaterialsView.qml
View File

@ -107,7 +107,6 @@ TabView
property var new_diameter_value: null; property var new_diameter_value: null;
property var old_diameter_value: null; property var old_diameter_value: null;
property var old_approximate_diameter_value: null; property var old_approximate_diameter_value: null;
property bool keyPressed: false
onYes: onYes:
{ {
@ -118,19 +117,11 @@ TabView
onNo: onNo:
{ {
properties.diameter = old_diameter_value; base.properties.diameter = old_diameter_value;
diameterSpinBox.value = properties.diameter; diameterSpinBox.value = Qt.binding(function() { return base.properties.diameter })
} }
onVisibilityChanged: onRejected: no()
{
if (!visible && !keyPressed)
{
// If the user closes this dialog without clicking on any button, it's the same as clicking "No".
no();
}
keyPressed = false;
}
} }
Label { width: scrollView.columnWidth; height: parent.rowHeight; verticalAlignment: Qt.AlignVCenter; text: catalog.i18nc("@label", "Display Name") } Label { width: scrollView.columnWidth; height: parent.rowHeight; verticalAlignment: Qt.AlignVCenter; text: catalog.i18nc("@label", "Display Name") }