From 670584651852a68e93e03d151684795937229c7f Mon Sep 17 00:00:00 2001
From: Dante Ruiz <dante@highfidelity.io>
Date: Fri, 6 Jan 2017 23:25:25 +0000
Subject: [PATCH] clean up round 1

---
 interface/resources/qml/desktop/Desktop.qml | 27 +--------------------
 libraries/ui/src/OffscreenUi.cpp            |  2 --
 2 files changed, 1 insertion(+), 28 deletions(-)

diff --git a/interface/resources/qml/desktop/Desktop.qml b/interface/resources/qml/desktop/Desktop.qml
index 66b59f0aea..c536020122 100644
--- a/interface/resources/qml/desktop/Desktop.qml
+++ b/interface/resources/qml/desktop/Desktop.qml
@@ -465,32 +465,7 @@ FocusScope {
     Component { id: fileDialogBuilder; FileDialog { } }
     function fileDialog(properties) {
         return fileDialogBuilder.createObject(desktop, properties);
-    }
-
-    MenuMouseHandler { id: menuPopperUpper }
-    function popupMenu(point) {
-        menuPopperUpper.popup(desktop, rootMenu.items, point);
-    }
-
-    function toggleMenu(point) {
-        menuPopperUpper.toggle(desktop, rootMenu.items, point);
-    }
-
-    Keys.onEscapePressed: {
-        if (menuPopperUpper.closeLastMenu()) {
-            event.accepted = true;
-            return;
-        }
-        event.accepted = false;
-    }
-
-    Keys.onLeftPressed: {
-        if (menuPopperUpper.closeLastMenu()) {
-            event.accepted = true;
-            return;
-        }
-        event.accepted = false;
-    }
+    } 
 
     function unfocusWindows() {
         // First find the active focus item, and unfocus it, all the way
diff --git a/libraries/ui/src/OffscreenUi.cpp b/libraries/ui/src/OffscreenUi.cpp
index 3e14d97d40..1814d30c0a 100644
--- a/libraries/ui/src/OffscreenUi.cpp
+++ b/libraries/ui/src/OffscreenUi.cpp
@@ -538,8 +538,6 @@ void OffscreenUi::unfocusWindows() {
 }
 
 void OffscreenUi::toggleMenu(const QPoint& screenPosition) { // caller should already have mapped using getReticlePosition
-    emit showDesktop(); // we really only want to do this if you're showing the menu, but for now this works
-    QMetaObject::invokeMethod(_desktop, "toggleMenu", Q_ARG(QVariant, screenPosition));
 }