From 9f501d4d72ccb0274798e0786905bd237ccb5ec0 Mon Sep 17 00:00:00 2001
From: ZappoMan <bradh@konamoxt.com>
Date: Thu, 20 Aug 2015 16:55:19 -0700
Subject: [PATCH 1/3] first cut at attempting to hide menu in full screen

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

diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index a28435e258..0bc4f9b943 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -4985,6 +4985,12 @@ void Application::setFullscreen(const QScreen* target) {
 #endif
     _window->windowHandle()->setScreen((QScreen*)target);
     _window->showFullScreen();
+    
+    // also hide the QMainWindow's menuBar
+    QMenuBar* menuBar = _window->menuBar();
+    if (menuBar) {
+        menuBar->setVisible(false);
+    }
 }
 
 void Application::unsetFullscreen(const QScreen* avoid) {
@@ -5015,6 +5021,12 @@ void Application::unsetFullscreen(const QScreen* avoid) {
 #else
     _window->setGeometry(targetGeometry);
 #endif
+
+    // also show the QMainWindow's menuBar
+    QMenuBar* menuBar = _window->menuBar();
+    if (menuBar) {
+        menuBar->setVisible(true);
+    }
 }
 
 

From 06b2a88fb6f730c7fd157f9543671c2c39efc373 Mon Sep 17 00:00:00 2001
From: ZappoMan <bradh@konamoxt.com>
Date: Thu, 20 Aug 2015 19:11:15 -0700
Subject: [PATCH 2/3] toggle menu near top of window

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

diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index 0bc4f9b943..a088c42f87 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -1744,6 +1744,27 @@ void Application::mouseMoveEvent(QMouseEvent* event, unsigned int deviceID) {
         return;
     }
 
+#if 1 //ndef Q_OS_MAC
+    // If in full screen, and our main windows menu bar is hidden, and we're close to the top of the QMainWindow
+    // then show the menubar.
+    if (_window->isFullScreen()) {
+        QMenuBar* menuBar = _window->menuBar();
+        if (menuBar) {
+            static const int MENU_TOGGLE_AREA = 10;
+            if (!menuBar->isVisible()) {
+                if (event->pos().y() <= MENU_TOGGLE_AREA) {
+                    menuBar->setVisible(true);
+                }
+            } else {
+                if (event->pos().y() > MENU_TOGGLE_AREA) {
+                    menuBar->setVisible(false);
+                }
+            }
+        }
+    }
+#endif
+
+
     _entities.mouseMoveEvent(event, deviceID);
 
     _controllerScriptingInterface.emitMouseMoveEvent(event, deviceID); // send events to any registered scripts
@@ -4986,11 +5007,13 @@ void Application::setFullscreen(const QScreen* target) {
     _window->windowHandle()->setScreen((QScreen*)target);
     _window->showFullScreen();
     
+#ifndef Q_OS_MAC
     // also hide the QMainWindow's menuBar
     QMenuBar* menuBar = _window->menuBar();
     if (menuBar) {
         menuBar->setVisible(false);
     }
+#endif
 }
 
 void Application::unsetFullscreen(const QScreen* avoid) {
@@ -5022,11 +5045,13 @@ void Application::unsetFullscreen(const QScreen* avoid) {
     _window->setGeometry(targetGeometry);
 #endif
 
+#ifndef Q_OS_MAC
     // also show the QMainWindow's menuBar
     QMenuBar* menuBar = _window->menuBar();
     if (menuBar) {
         menuBar->setVisible(true);
     }
+#endif
 }
 
 

From bd29fb247497856f688f699780904eef1958c41f Mon Sep 17 00:00:00 2001
From: ZappoMan <bradh@konamoxt.com>
Date: Thu, 20 Aug 2015 19:31:51 -0700
Subject: [PATCH 3/3] fix ifdef

---
 interface/src/Application.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index a088c42f87..b9bafbab1a 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -1744,7 +1744,7 @@ void Application::mouseMoveEvent(QMouseEvent* event, unsigned int deviceID) {
         return;
     }
 
-#if 1 //ndef Q_OS_MAC
+#ifndef Q_OS_MAC
     // If in full screen, and our main windows menu bar is hidden, and we're close to the top of the QMainWindow
     // then show the menubar.
     if (_window->isFullScreen()) {