From 2dbf8d7daf6a45a18991f06dd6ec1ef08dfe8f15 Mon Sep 17 00:00:00 2001
From: David Rowe <david@ctrlaltstudio.com>
Date: Thu, 19 Jun 2014 11:08:21 -0700
Subject: [PATCH 1/2] Fix fullscreen toggle shortcut

Remove the "Meta" modifier so that the shortcut works on Windows.
---
 interface/src/Menu.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/interface/src/Menu.cpp b/interface/src/Menu.cpp
index 5c8c2e97aa..9df3e25bf8 100644
--- a/interface/src/Menu.cpp
+++ b/interface/src/Menu.cpp
@@ -251,7 +251,7 @@ Menu::Menu() :
 
     addCheckableActionToQMenuAndActionHash(viewMenu,
                                            MenuOption::Fullscreen,
-                                           Qt::CTRL | Qt::META | Qt::Key_F,
+                                           Qt::CTRL | Qt::Key_F,
                                            false,
                                            appInstance,
                                            SLOT(setFullscreen(bool)));

From 633746ab168fa5fc7cbb30895570f20066984696 Mon Sep 17 00:00:00 2001
From: David Rowe <david@ctrlaltstudio.com>
Date: Fri, 20 Jun 2014 13:30:04 -0700
Subject: [PATCH 2/2] Different fullscreen shortcuts for Mac and Windows

Revert to the original Mac OSX key combination and provide alternative for Windows.
---
 interface/src/Menu.cpp | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/interface/src/Menu.cpp b/interface/src/Menu.cpp
index 9df3e25bf8..22a832278f 100644
--- a/interface/src/Menu.cpp
+++ b/interface/src/Menu.cpp
@@ -249,12 +249,21 @@ Menu::Menu() :
 
     QMenu* viewMenu = addMenu("View");
 
+#ifdef Q_OS_MAC
+    addCheckableActionToQMenuAndActionHash(viewMenu,
+                                           MenuOption::Fullscreen,
+                                           Qt::CTRL | Qt::META | Qt::Key_F,
+                                           false,
+                                           appInstance,
+                                           SLOT(setFullscreen(bool)));
+#else
     addCheckableActionToQMenuAndActionHash(viewMenu,
                                            MenuOption::Fullscreen,
                                            Qt::CTRL | Qt::Key_F,
                                            false,
                                            appInstance,
                                            SLOT(setFullscreen(bool)));
+#endif
     addCheckableActionToQMenuAndActionHash(viewMenu, MenuOption::FirstPerson, Qt::Key_P, true,
                                             appInstance,SLOT(cameraMenuChanged()));
     addCheckableActionToQMenuAndActionHash(viewMenu, MenuOption::Mirror, Qt::SHIFT | Qt::Key_H, true);