Changeset 61985 in vbox for trunk

Timestamp:

Jul 1, 2016 3:26:45 PM (9 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:8422: Runtime UI: Seamless window: Extended minimized state handling as done for full-screen window under Qt5 (s.a. r108013, r108415, r108422).

Location:

trunk/src/VBox/Frontends/VirtualBox/src/runtime/seamless

Files:

• UIMachineWindowSeamless.cpp (modified) (3 diffs)
• UIMachineWindowSeamless.h (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/runtime/seamless/UIMachineWindowSeamless.cpp

@@ -50 +50 @@
     , m_pMiniToolBar(0)
 #endif /* VBOX_WS_WIN || VBOX_WS_X11 */
+    , m_fWasMinimized(false)
 {
 }
@@ -186 +187 @@
     AssertPtrReturnVoid(pSeamlessLogic);
 
-    /* Make sure window should be shown and mapped to some host-screen: */
+    /* If window shouldn't be shown or mapped to some host-screen: */
     if (!uisession()->isScreenVisible(m_uScreenId) ||
         !pSeamlessLogic->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 window should be shown and mapped to some host-screen: */
     else
     {
-        /* Ignore if window minimized: */
-        if (isMinimized())
-            return;
+        /* Check whether window was minimized: */
+        const bool fWasMinimized = isMinimized() && isVisible();
+        /* And reset it's state in such case before exposing: */
+        if (fWasMinimized)
+            setWindowState(Qt::WindowNoState);
 
         /* Make sure window have appropriate geometry: */
@@ -204 +213 @@
         /* Show window in normal mode: */
         show();
+
+        /* Restore minimized state if necessary: */
+        if (m_fWasMinimized || fWasMinimized)
+        {
+            m_fWasMinimized = false;
+            QMetaObject::invokeMethod(this, "showMinimized", Qt::QueuedConnection);
+        }
 
         /* Adjust machine-view size if necessary: */

trunk/src/VBox/Frontends/VirtualBox/src/runtime/seamless/UIMachineWindowSeamless.h

@@ -98 +98 @@
 #endif /* VBOX_WITH_MASKED_SEAMLESS */
 
+    /** Holds whether the window was minimized before became hidden.
+      * Used to restore minimized state when the window shown again. */
+    bool m_fWasMinimized;
+
     /** Factory support. */
     friend class UIMachineWindow;