From f78ee7c167bb6783a9886230ff6cd793e7de19c1 Mon Sep 17 00:00:00 2001
From: Cain Kilgore <cdonaghey728@gmail.com>
Date: Tue, 9 Jan 2018 09:44:12 +0000
Subject: [PATCH] WL 21667 - Window.browseDir() dialog doesn't let user use Esc
 to cancel

---
 .../resources/qml/dialogs/FileDialog.qml      | 24 +++++++++++++++----
 1 file changed, 20 insertions(+), 4 deletions(-)

diff --git a/interface/resources/qml/dialogs/FileDialog.qml b/interface/resources/qml/dialogs/FileDialog.qml
index b9633104d5..c49fa145cd 100644
--- a/interface/resources/qml/dialogs/FileDialog.qml
+++ b/interface/resources/qml/dialogs/FileDialog.qml
@@ -70,7 +70,16 @@ ModalWindow {
 
     signal selectedFile(var file);
     signal canceled();
-
+    signal selected(int button);
+	
+	function click(button) {
+		clickedButton = button;
+		selected(button);
+		destroy();
+    }
+	
+	property int clickedButton: OriginalDialogs.StandardButton.NoButton;
+	
     Component.onCompleted: {
         console.log("Helper " + helper + " drives " + drives);
 
@@ -628,7 +637,10 @@ ModalWindow {
                 case Qt.Key_Backtab:
                     event.accepted = false;
                     break;
-
+				case Qt.Key_Escape:
+					event.accepted = true;
+					root.click(OriginalDialogs.StandardButton.Cancel);
+					break;
                 default:
                     if (addToPrefix(event)) {
                         event.accepted = true
@@ -793,7 +805,11 @@ ModalWindow {
         case Qt.Key_Home:
             event.accepted = d.navigateHome();
             break;
-
-        }
+		
+		case Qt.Key_Escape:
+			event.accepted = true;
+			root.click(OriginalDialogs.StandardButton.Cancel);
+			break;
+		}
     }
 }