don't exit app in full screen or hdm mode

interface/src/Application.cpp

@@ -438,6 +438,7 @@ Application::Application(int& argc, char** argv, QElapsedTimer &startup_time) :
 
 void Application::aboutToQuit() {
     _aboutToQuit = true;
+    setFullscreen(false); // if you exit while in full screen, you'll get bad behavior when you restart.
 }
 
 Application::~Application() {

interface/src/ui/HMDToolsDialog.cpp

@@ -30,7 +30,8 @@ HMDToolsDialog::HMDToolsDialog(QWidget* parent) :
     QDialog(parent, Qt::Window | Qt::WindowCloseButtonHint | Qt::WindowStaysOnTopHint) ,
     _previousScreen(NULL),
     _hmdScreen(NULL),
-    _previousDialogScreen(NULL)
+    _previousDialogScreen(NULL),
+    _inHDMMode(false)
 {
     this->setWindowTitle("HMD Tools");
 
@@ -65,14 +66,18 @@ HMDToolsDialog::HMDToolsDialog(QWidget* parent) :
     QWindow* mainWindow = Application::getInstance()->getWindow()->windowHandle();
     connect(mainWindow, &QWindow::screenChanged, this, &HMDToolsDialog::applicationWindowScreenChanged);
 
-    // watch for our dialog window moving screens. If it does we want to enforce our rules about what screens we're
+    // watch for our dialog window moving screens. If it does we want to enforce our rules about
-    // allowed on
+    // what screens we're allowed on
     QWindow* dialogWindow = windowHandle();
     connect(dialogWindow, &QWindow::screenChanged, this, &HMDToolsDialog::dialogWindowScreenChanged);
     connect(dialogWindow, &QWindow::xChanged, this, &HMDToolsDialog::dialogWindowGeometryChanged);
     connect(dialogWindow, &QWindow::yChanged, this, &HMDToolsDialog::dialogWindowGeometryChanged);
     connect(dialogWindow, &QWindow::widthChanged, this, &HMDToolsDialog::dialogWindowGeometryChanged);
     connect(dialogWindow, &QWindow::heightChanged, this, &HMDToolsDialog::dialogWindowGeometryChanged);
+    
+    // when the application is about to quit, leave HDM mode
+    connect(Application::getInstance(), SIGNAL(aboutToQuit()), this, SLOT(aboutToQuit()));
+    
 }
 
 HMDToolsDialog::~HMDToolsDialog() {
@@ -159,37 +164,45 @@ QString HMDToolsDialog::getDebugDetails() const {
 }
 
 void HMDToolsDialog::enterModeClicked(bool checked) {
-    _debugDetails->setText(getDebugDetails());
+    enterHDMMode();
+}
 
-    int hmdScreen = OculusManager::getHMDScreen();
+void HMDToolsDialog::enterHDMMode() {
-    qDebug() << "enterModeClicked().... hmdScreen:" << hmdScreen;
+    if (!_inHDMMode) {
+        _debugDetails->setText(getDebugDetails());
+
+        int hmdScreen = OculusManager::getHMDScreen();
+        qDebug() << "enterModeClicked().... hmdScreen:" << hmdScreen;
     
-    if (hmdScreen >= 0) {
+        if (hmdScreen >= 0) {
-        QWindow* mainWindow = Application::getInstance()->getWindow()->windowHandle();
+            QWindow* mainWindow = Application::getInstance()->getWindow()->windowHandle();
-        _hmdScreen = QGuiApplication::screens()[hmdScreen];
+            _hmdScreen = QGuiApplication::screens()[hmdScreen];
         
-        _previousRect = Application::getInstance()->getWindow()->rect();
+            _previousRect = Application::getInstance()->getWindow()->rect();
-        _previousRect = QRect(mainWindow->mapToGlobal(_previousRect.topLeft()), 
+            _previousRect = QRect(mainWindow->mapToGlobal(_previousRect.topLeft()), 
-                                mainWindow->mapToGlobal(_previousRect.bottomRight()));
+                                    mainWindow->mapToGlobal(_previousRect.bottomRight()));
-        _previousScreen = mainWindow->screen();
+            _previousScreen = mainWindow->screen();
-        QRect rect = QApplication::desktop()->screenGeometry(hmdScreen);
+            QRect rect = QApplication::desktop()->screenGeometry(hmdScreen);
-        mainWindow->setScreen(_hmdScreen);
+            mainWindow->setScreen(_hmdScreen);
-        mainWindow->setGeometry(rect);
+            mainWindow->setGeometry(rect);
 
-        _wasMoved = true;
+            _wasMoved = true;
-    }
+        }
     
     
-    // if we're on a single screen setup, then hide our tools window when entering HMD mode
+        // if we're on a single screen setup, then hide our tools window when entering HMD mode
-    if (QApplication::desktop()->screenCount() == 1) {
+        if (QApplication::desktop()->screenCount() == 1) {
-        close();
+            close();
-    }
+        }
 
-    Application::getInstance()->setFullscreen(true);
+        Application::getInstance()->setFullscreen(true);
-    Application::getInstance()->setEnableVRMode(true);
+        Application::getInstance()->setEnableVRMode(true);
     
-    const int SLIGHT_DELAY = 500;
+        const int SLIGHT_DELAY = 500;
-    QTimer::singleShot(SLIGHT_DELAY, this, SLOT(activateWindowAfterEnterMode()));
+        QTimer::singleShot(SLIGHT_DELAY, this, SLOT(activateWindowAfterEnterMode()));
+    
+        _inHDMMode = true;
+    }
 }
 
 void HMDToolsDialog::activateWindowAfterEnterMode() {
@@ -199,23 +212,30 @@ void HMDToolsDialog::activateWindowAfterEnterMode() {
     centerCursorOnWidget(Application::getInstance()->getWindow());
 }
 
-
 void HMDToolsDialog::leaveModeClicked(bool checked) {
-    _debugDetails->setText(getDebugDetails());
+    leaveHDMMode();
+}
 
-    Application::getInstance()->setFullscreen(false);
-    Application::getInstance()->setEnableVRMode(false);
-    Application::getInstance()->getWindow()->activateWindow();
 
-    if (_wasMoved) {
+void HMDToolsDialog::leaveHDMMode() {
-        QWindow* mainWindow = Application::getInstance()->getWindow()->windowHandle();
+    if (_inHDMMode) {
-        mainWindow->setScreen(_previousScreen);
+        _debugDetails->setText(getDebugDetails());
-        mainWindow->setGeometry(_previousRect);
+
+        Application::getInstance()->setFullscreen(false);
+        Application::getInstance()->setEnableVRMode(false);
+        Application::getInstance()->getWindow()->activateWindow();
+
+        if (_wasMoved) {
+            QWindow* mainWindow = Application::getInstance()->getWindow()->windowHandle();
+            mainWindow->setScreen(_previousScreen);
+            mainWindow->setGeometry(_previousRect);
     
-        const int SLIGHT_DELAY = 1500;
+            const int SLIGHT_DELAY = 1500;
-        QTimer::singleShot(SLIGHT_DELAY, this, SLOT(moveWindowAfterLeaveMode()));
+            QTimer::singleShot(SLIGHT_DELAY, this, SLOT(moveWindowAfterLeaveMode()));
+        }
+        _wasMoved = false;
+        _inHDMMode = false;
     }
-    _wasMoved = false;
 }
 
 void HMDToolsDialog::moveWindowAfterLeaveMode() {
@@ -256,3 +276,10 @@ void HMDToolsDialog::hideEvent(QHideEvent* event) {
 }
 
 
+void HMDToolsDialog::aboutToQuit() {
+    if (_inHDMMode) {
+        leaveHDMMode();
+    }
+}
+
+

interface/src/ui/HMDToolsDialog.h

@@ -35,6 +35,7 @@ public slots:
     void applicationWindowScreenChanged(QScreen* screen);
     void dialogWindowScreenChanged(QScreen* screen);
     void dialogWindowGeometryChanged(int arg);
+    void aboutToQuit();
 
 protected:
     virtual void closeEvent(QCloseEvent*); // Emits a 'closed' signal when this dialog is closed.
@@ -43,6 +44,8 @@ protected:
 
 private:
     void centerCursorOnWidget(QWidget* widget);
+    void enterHDMMode();
+    void leaveHDMMode();
 
     bool _wasMoved;
     QRect _previousRect;
@@ -52,6 +55,7 @@ private:
 
     QRect _previousDialogRect;
     QScreen* _previousDialogScreen;
+    bool _inHDMMode;
 };
 
 #endif // hifi_HMDToolsDialog_h