Changeset 61430 in vbox for trunk/src/VBox/Frontends

Timestamp:

Jun 3, 2016 9:25:38 AM (9 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:8387: Runtime UI: Full-screen: Fix for loosing screens and mini-toolbar visibility when windows are minimized.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/runtime/fullscreen

Files:

• UIMachineWindowFullscreen.cpp (modified) (4 diffs)
• UIMachineWindowFullscreen.h (modified) (1 diff)

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

@@ -56 +56 @@
 #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(Q_WS_WIN) || defined(Q_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 /* Q_WS_WIN || Q_WS_X11 */
+
+    /* Call to base-class: */
+    QMainWindow::changeEvent(pChangeEvent);
 }
 
@@ -375 +409 @@
         !pFullscreenLogic->hasHostScreenForGuestScreen(m_uScreenId))
     {
-#if defined(VBOX_WS_WIN) || defined(VBOX_WS_X11)
-        /* If there is a mini-toolbar: */
-        if (m_pMiniToolBar)
-        {
-            /* Hide mini-toolbar: */
-            m_pMiniToolBar->hide();
-        }
-#endif /* VBOX_WS_WIN || VBOX_WS_X11 */
-
         /* Hide window: */
         hide();
@@ -389 +414 @@
     else
     {
-        /* Ignore if window minimized: */
-        if (isMinimized())
+        /* Ignore if window is minimized and visible: */
+        if (isMinimized() && isVisible())
             return;
 
@@ -422 +447 @@
         }
 #elif defined(VBOX_WS_WIN) || defined(VBOX_WS_X11)
-        /* Show window in fullscreen mode: */
-        showFullScreen();
-
-        /* If there is a mini-toolbar: */
-        if (m_pMiniToolBar)
-        {
-            /* Show mini-toolbar in full-screen mode: */
-            m_pMiniToolBar->showFullScreen();
+        /* If machine-window is in minimized mode: */
+        if (isMinimized())
+        {
+            /* Show window in minimized mode: */
+            showMinimized();
+        }
+        else
+        {
+            /* Show window in fullscreen mode: */
+            showFullScreen();
         }
 #endif /* VBOX_WS_WIN || VBOX_WS_X11 */

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

@@ -51 +51 @@
     /** Constructor, passes @a pMachineLogic and @a uScreenId to the UIMachineWindow constructor. */
     UIMachineWindowFullscreen(UIMachineLogic *pMachineLogic, ulong uScreenId);
+
+    /** Handles Qt change @a pChangeEvent. */
+    void changeEvent(QEvent *pChangeEvent);
 
 #ifdef VBOX_WS_MAC