Changeset 61659 in vbox for trunk/src/VBox/Frontends/VirtualBox/src/runtime/fullscreen/UIMachineWindowFullscreen.cpp

Timestamp:

Jun 10, 2016 2:22:03 PM (9 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:8422: Runtime UI: Full-screen window: Clear window state on hiding, that allows us to properly expose window again on show; That way we forced to forget the minimized state, so storing separately.

File:

• trunk/src/VBox/Frontends/VirtualBox/src/runtime/fullscreen/UIMachineWindowFullscreen.cpp (modified) (3 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/runtime/fullscreen/UIMachineWindowFullscreen.cpp

@@ -60 +60 @@
     , m_fIsInFullscreenTransition(false)
 #endif /* VBOX_WS_MAC */
-{
-}
-
-void UIMachineWindowFullscreen::changeEvent(QEvent *pChangeEvent)
-{
-    /* Overriding changeEvent for controlling mini-tool bar visibilty.
-     * Hiding tool-bar when machine-window is minimized and show it in full-screen: */
-#if defined(VBOX_WS_WIN) || defined(VBOX_WS_X11)
-    if (pChangeEvent->type() == QEvent::WindowStateChange)
-    {
-        /* If machine-window is in minimized mode: */
-        if (isMinimized())
-        {
-            /* If there is a mini-toolbar: */
-            if (m_pMiniToolBar)
-            {
-                /* Hide mini-toolbar: */
-                m_pMiniToolBar->hide();
-            }
-        }
-        /* If machine-window is in full-screen mode: */
-        else
-        {
-            /* If there is a mini-toolbar: */
-            if (m_pMiniToolBar)
-            {
-                /* Show mini-toolbar in full-screen mode: */
-                m_pMiniToolBar->showFullScreen();
-            }
-        }
-    }
-#endif /* VBOX_WS_WIN || VBOX_WS_X11 */
-
-    /* Call to base-class: */
-    UIMachineWindow::changeEvent(pChangeEvent);
+    , m_fWasMinimized(false)
+{
 }
 
@@ -451 +418 @@
         !pFullscreenLogic->hasHostScreenForGuestScreen(m_uScreenId))
     {
-        /* Hide window: */
+        /* Remember whether the window was minimized: */
+        if (isMinimized())
+            m_fWasMinimized = true;
+        /* Hide window and reset it's state to NONE: */
+        setWindowState(Qt::WindowNoState);
         hide();
+        /* If there is mini-toolbar: */
+        if (m_pMiniToolBar)
+        {
+            /* Hide mini-toolbar and reset it's state to NONE: */
+            m_pMiniToolBar->setWindowState(Qt::WindowNoState);
+            m_pMiniToolBar->hide();
+        }
     }
     else
@@ -489 +467 @@
         }
 #elif defined(VBOX_WS_WIN) || defined(VBOX_WS_X11)
-        /* If machine-window is in minimized mode: */
-        if (isMinimized())
-        {
-            /* Show window in minimized mode: */
+        /* If there is mini-toolbar: */
+        if (m_pMiniToolBar)
+        {
+            /* Show mini-toolbar: */
+            m_pMiniToolBar->showFullScreen();
+        }
+        /* Show window: */
+        showFullScreen();
+        /* Restore minimized state if necessary: */
+        if (m_fWasMinimized)
+        {
+            m_fWasMinimized = false;
             showMinimized();
-        }
-        else
-        {
-            /* Show window in fullscreen mode: */
-            showFullScreen();
         }
 #endif /* VBOX_WS_WIN || VBOX_WS_X11 */