From 8a57a646177795ae953cf85b60b2c17e86fbf364 Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Fri, 30 Jan 2015 13:43:18 -0800
Subject: [PATCH] put application in full screen mode

---
 gvr-interface/CMakeLists.txt        |  3 +-
 gvr-interface/src/GVRMainWindow.cpp | 51 ++++++++++++++---------------
 gvr-interface/src/GVRMainWindow.h   |  6 +++-
 3 files changed, 31 insertions(+), 29 deletions(-)

diff --git a/gvr-interface/CMakeLists.txt b/gvr-interface/CMakeLists.txt
index b52047a38a..6ce5c28e4e 100644
--- a/gvr-interface/CMakeLists.txt
+++ b/gvr-interface/CMakeLists.txt
@@ -11,14 +11,13 @@ if (ANDROID)
   set(ANDROID_ACTIVITY_NAME io.highfidelity.gvrinterface.InterfaceActivity)
   set(ANDROID_APK_VERSION_NAME "0.1")
   set(ANDROID_APK_VERSION_CODE 1)
+  set(ANDROID_APK_FULLSCREEN TRUE)
   set(ANDROID_DEPLOY_QT_INSTALL "--install")
   
   set(BUILD_SHARED_LIBS ON)
   set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${ANDROID_APK_OUTPUT_DIR}/libs/${ANDROID_ABI}")
   
   setup_hifi_library(Gui Widgets AndroidExtras)
-  
-  add_definitions(-DANDROID)
 else ()
   setup_hifi_project(Gui Widgets)
 endif ()
diff --git a/gvr-interface/src/GVRMainWindow.cpp b/gvr-interface/src/GVRMainWindow.cpp
index 456c6851d5..1589afd009 100644
--- a/gvr-interface/src/GVRMainWindow.cpp
+++ b/gvr-interface/src/GVRMainWindow.cpp
@@ -26,7 +26,8 @@
 #include "GVRMainWindow.h"
 
 GVRMainWindow::GVRMainWindow(QWidget* parent) :
-    QMainWindow(parent)
+    QMainWindow(parent),
+    _menuBar(NULL)
 {
     
 #ifndef ANDROID
@@ -35,25 +36,7 @@ GVRMainWindow::GVRMainWindow(QWidget* parent) :
     setFixedSize(NOTE_4_WIDTH / 2, NOTE_4_HEIGHT / 2);
 #endif
     
-    QMenu* fileMenu = new QMenu("File");
-    QMenu* helpMenu = new QMenu("Help");
-    
-    menuBar()->addMenu(fileMenu);
-    menuBar()->addMenu(helpMenu);
-    
-    QAction* goToAddress = new QAction("Go to Address", fileMenu);
-    connect(goToAddress, &QAction::triggered, this, &GVRMainWindow::showAddressBar);
-    fileMenu->addAction(goToAddress);
-    
-#ifdef ANDROID
-    QAction* goFullScreen = new QAction("Enter Full Screen", fileMenu);
-    connect(goFullScreen, &QAction::triggered, this, &GVRMainWindow::goFullScreen);
-    fileMenu->addAction(goFullScreen);
-#endif
-    
-    QAction* aboutQt = new QAction("About Qt", helpMenu);
-    connect(aboutQt, &QAction::triggered, qApp, &QApplication::aboutQt);
-    helpMenu->addAction(aboutQt);
+    setupMenuBar();
     
     QWidget* baseWidget = new QWidget(this);
     
@@ -70,12 +53,28 @@ GVRMainWindow::GVRMainWindow(QWidget* parent) :
     new InterfaceView(baseWidget);
 }
 
-void GVRMainWindow::goFullScreen() {
-#ifdef ANDROID
-    menuBar()->hide();
-#else
-    showFullScreen();
-#endif
+GVRMainWindow::~GVRMainWindow() {
+    delete _menuBar;
+}
+
+void GVRMainWindow::setupMenuBar() {
+    QMenu* fileMenu = new QMenu("File");
+    QMenu* helpMenu = new QMenu("Help");
+    
+    _menuBar = new QMenuBar(0);
+    
+    _menuBar->addMenu(fileMenu);
+    _menuBar->addMenu(helpMenu);
+    
+    QAction* goToAddress = new QAction("Go to Address", fileMenu);
+    connect(goToAddress, &QAction::triggered, this, &GVRMainWindow::showAddressBar);
+    fileMenu->addAction(goToAddress);
+    
+    QAction* aboutQt = new QAction("About Qt", helpMenu);
+    connect(aboutQt, &QAction::triggered, qApp, &QApplication::aboutQt);
+    helpMenu->addAction(aboutQt);
+    
+    setMenuBar(_menuBar);
 }
 
 void GVRMainWindow::showAddressBar() {
diff --git a/gvr-interface/src/GVRMainWindow.h b/gvr-interface/src/GVRMainWindow.h
index 47eee2ae98..44d3bd7196 100644
--- a/gvr-interface/src/GVRMainWindow.h
+++ b/gvr-interface/src/GVRMainWindow.h
@@ -14,17 +14,21 @@
 
 #include <QtWidgets/QMainWindow>
 
+class QMenuBar;
 class QVBoxLayout;
 
 class GVRMainWindow : public QMainWindow {
     Q_OBJECT
 public:
     GVRMainWindow(QWidget* parent = 0);
+    ~GVRMainWindow();
 public slots:
     void showAddressBar();
-    void goFullScreen();
 private:
+    void setupMenuBar();
+    
     QVBoxLayout* _mainLayout;
+    QMenuBar* _menuBar;
 };
 
 #endif // hifi_GVRMainWindow_h