From 04e7e979aa8b1a7b14f439c953208230aa9c2830 Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Mon, 27 Oct 2014 15:42:40 -0700
Subject: [PATCH] bubble up HFCancelEvent from ESC key

---
 interface/src/Application.cpp | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index 02fdbbb534..9b83e6211c 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -56,6 +56,7 @@
 #include <AudioInjector.h>
 #include <EntityScriptingInterface.h>
 #include <HFActionEvent.h>
+#include <HFCancelEvent.h>
 #include <LocalVoxelsList.h>
 #include <Logging.h>
 #include <NetworkAccessManager.h>
@@ -1101,9 +1102,15 @@ void Application::keyPressEvent(QKeyEvent* event) {
             case Qt::Key_Equal:
                 _myAvatar->resetSize();
                 break;
-            case Qt::Key_Escape:
+            case Qt::Key_Escape: {
                 OculusManager::abandonCalibration();
+                
+                // this fires the HFCancelEvent
+                HFCancelEvent startCancelEvent(HFCancelEvent::startType());
+                sendEvent(this, &startCancelEvent);
+                
                 break;
+            }
             default:
                 event->ignore();
                 break;
@@ -1174,6 +1181,13 @@ void Application::keyReleaseEvent(QKeyEvent* event) {
         case Qt::Key_Alt:
             _myAvatar->clearDriveKeys();
             break;
+        case Qt::Key_Escape: {
+            // this ends the HFCancelEvent
+            HFCancelEvent endCancelEvent(HFCancelEvent::endType());
+            sendEvent(this, &endCancelEvent);
+            
+            break;
+        }
         default:
             event->ignore();
             break;