From 365d725e424d660a937b85ead38fd019ab5df185 Mon Sep 17 00:00:00 2001
From: Ghostkeeper <rubend@tutanota.com>
Date: Wed, 3 Jul 2019 10:32:00 +0200
Subject: [PATCH] Add escape as hotkey to exit full screen

Should be easier to discover.

Fixes #5956.
---
 resources/qml/Actions.qml | 17 +++++++++++++----
 resources/qml/Cura.qml    |  8 +++++++-
 2 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/resources/qml/Actions.qml b/resources/qml/Actions.qml
index 71a655c664..7e6afa813d 100644
--- a/resources/qml/Actions.qml
+++ b/resources/qml/Actions.qml
@@ -65,6 +65,7 @@ Item
     property alias about: aboutAction;
 
     property alias toggleFullScreen: toggleFullScreenAction;
+    property alias exitFullScreen: exitFullScreenAction
 
     property alias configureSettingVisibility: configureSettingVisibilityAction
 
@@ -82,10 +83,18 @@ Item
 
     Action
     {
-        id:toggleFullScreenAction
-        shortcut: StandardKey.FullScreen;
-        text: catalog.i18nc("@action:inmenu", "Toggle Full Screen");
-        iconName: "view-fullscreen";
+        id: toggleFullScreenAction
+        shortcut: StandardKey.FullScreen
+        text: catalog.i18nc("@action:inmenu", "Toggle Full Screen")
+        iconName: "view-fullscreen"
+    }
+
+    Action
+    {
+        id: exitFullScreenAction
+        shortcut: StandardKey.Cancel
+        text: catalog.i18nc("@action:inmenu", "Exit Full Screen")
+        iconName: "view-fullscreen"
     }
 
     Action
diff --git a/resources/qml/Cura.qml b/resources/qml/Cura.qml
index 790a522b26..ffa6502563 100644
--- a/resources/qml/Cura.qml
+++ b/resources/qml/Cura.qml
@@ -573,7 +573,13 @@ UM.MainWindow
     Connections
     {
         target: Cura.Actions.toggleFullScreen
-        onTriggered: base.toggleFullscreen();
+        onTriggered: base.toggleFullscreen()
+    }
+
+    Connections
+    {
+        target: Cura.Actions.exitFullScreen
+        onTriggered: base.exitFullscreen()
     }
 
     FileDialog