Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-04-29 21:43:07 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #12121 from cain-kilgore/21667

Browse source 
WL 21667 - Window.browseDir() dialog doesn't let user use Esc to cancel
This commit is contained in:
MiladNazeri 2018-01-10 17:11:54 -08:00 committed by GitHub
commit c77d2f4e58
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 19 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
interface/resources/qml/dialogs/FileDialog.qml
View file

@ -70,7 +70,15 @@ ModalWindow {
signal selectedFile(var file); signal selectedFile(var file);
signal canceled(); signal canceled();
signal selected(int button);
function click(button) {
clickedButton = button;
selected(button);
destroy();
}
property int clickedButton: OriginalDialogs.StandardButton.NoButton;
Component.onCompleted: { Component.onCompleted: {
console.log("Helper " + helper + " drives " + drives); console.log("Helper " + helper + " drives " + drives);
@ -628,7 +636,10 @@ ModalWindow {
case Qt.Key_Backtab: case Qt.Key_Backtab:
event.accepted = false; event.accepted = false;
break; break;
case Qt.Key_Escape:
event.accepted = true;
root.click(OriginalDialogs.StandardButton.Cancel);
break;
default: default:
if (addToPrefix(event)) { if (addToPrefix(event)) {
event.accepted = true event.accepted = true
@ -793,7 +804,11 @@ ModalWindow {
case Qt.Key_Home: case Qt.Key_Home:
event.accepted = d.navigateHome(); event.accepted = d.navigateHome();
break; break;
} case Qt.Key_Escape:
event.accepted = true;
root.click(OriginalDialogs.StandardButton.Cancel);
break;
}
} }
} }