From 63d0efcdecf7da71746163c304fd7a1b58d05316 Mon Sep 17 00:00:00 2001
From: David Rowe <david@ctrlaltstudio.com>
Date: Wed, 22 Apr 2015 09:16:15 -0700
Subject: [PATCH] Open and close avatar selector with Ctrl-A

---
 examples/avatarSelector.js    | 33 ++++++++++++++++++++++++---------
 interface/src/Application.cpp |  2 +-
 2 files changed, 25 insertions(+), 10 deletions(-)

diff --git a/examples/avatarSelector.js b/examples/avatarSelector.js
index 41d6abbe2b..dfc3f21cb5 100644
--- a/examples/avatarSelector.js
+++ b/examples/avatarSelector.js
@@ -89,7 +89,7 @@ var DRONE_VOLUME = 0.3;
 
 function drawLobby() {
     if (!panelWall) {
-        print("Adding overlays for the lobby panel wall and orb shell.");
+        print("Adding overlays for the avatar selector panel wall and orb shell.");
 
         var cameraEuler = Quat.safeEulerAngles(Camera.orientation);
         var towardsMe = Quat.angleAxis(cameraEuler.y + 180, { x: 0, y: 1, z: 0 });
@@ -294,13 +294,27 @@ function actionStartEvent(event) {
     }
 }
 
-function backStartEvent() {
-    if (!panelWall) {
-        toggleEnvironmentRendering(false);
-        drawLobby();
-        changeLobbyTextures();
-    } else {
-        cleanupLobby();
+var control = false;
+
+function keyPressEvent(event) {
+    if (event.text === "CONTROL") {
+        control = true;
+    }
+
+    if (control && event.text === "a") {
+        if (!panelWall) {
+            toggleEnvironmentRendering(false);
+            drawLobby();
+            changeLobbyTextures();
+        } else {
+            cleanupLobby();
+        }
+    }
+}
+
+function keyReleaseEvent(event) {
+    if (event.text === "CONTROL") {
+        control = false;
     }
 }
 
@@ -394,7 +408,8 @@ function mouseMoveEvent(event) {
 }
 
 Controller.actionStartEvent.connect(actionStartEvent);
-Controller.backStartEvent.connect(backStartEvent);
+Controller.keyPressEvent.connect(keyPressEvent);
+Controller.keyReleaseEvent.connect(keyReleaseEvent);
 Script.update.connect(update);
 Script.scriptEnding.connect(maybeCleanupLobby);
 Controller.mouseMoveEvent.connect(mouseMoveEvent);
diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index 34825ee725..734738a290 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -1020,7 +1020,7 @@ void Application::keyPressEvent(QKeyEvent* event) {
             case Qt::Key_A:
                 if (isShifted) {
                     Menu::getInstance()->triggerOption(MenuOption::Atmosphere);
-                } else {
+                } else if (!isMeta) {
                     _myAvatar->setDriveKeys(ROT_LEFT, 1.0f);
                 }
                 break;