Changeset 65419 in vbox for trunk/src/VBox

Timestamp:

Jan 24, 2017 10:58:56 AM (8 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:8636: X11: Runtime UI: After r113027 we need a mechanism for restoring from minimized state similar to that full-screen mode has (s.a. r108421).

Location:

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

Files:

• UIMachineWindowSeamless.cpp (modified) (2 diffs)
• UIMachineWindowSeamless.h (modified) (2 diffs)

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

@@ -52 +52 @@
 #endif /* VBOX_WS_WIN || VBOX_WS_X11 */
     , m_fWasMinimized(false)
+#if defined(VBOX_WS_X11) && QT_VERSION >= 0x050000
+    , m_fIsMinimized(false)
+#endif /* VBOX_WS_X11 && QT_VERSION >= 0x050000 */
 {
 }
@@ -298 +301 @@
 #endif /* VBOX_WS_WIN || VBOX_WS_X11 */
 
+#if defined(VBOX_WS_X11) && QT_VERSION >= 0x050000
+void UIMachineWindowSeamless::changeEvent(QEvent *pEvent)
+{
+    switch (pEvent->type())
+    {
+        case QEvent::WindowStateChange:
+        {
+            /* Watch for window state changes: */
+            QWindowStateChangeEvent *pChangeEvent = static_cast<QWindowStateChangeEvent*>(pEvent);
+            LogRel2(("GUI: UIMachineWindowSeamless::changeEvent: Window state changed from %d to %d\n",
+                     (int)pChangeEvent->oldState(), (int)windowState()));
+            if (   windowState() == Qt::WindowMinimized
+                && pChangeEvent->oldState() == Qt::WindowNoState
+                && !m_fIsMinimized)
+            {
+                /* Mark window minimized, isMinimized() is not enough due to Qt5vsX11 fight: */
+                LogRel2(("GUI: UIMachineWindowSeamless::changeEvent: Window minimized\n"));
+                m_fIsMinimized = true;
+            }
+            else
+            if (   windowState() == Qt::WindowNoState
+                && pChangeEvent->oldState() == Qt::WindowMinimized
+                && m_fIsMinimized)
+            {
+                /* Mark window restored, and do manual restoring with showInNecessaryMode(): */
+                LogRel2(("GUI: UIMachineWindowSeamless::changeEvent: Window restored\n"));
+                m_fIsMinimized = false;
+                showInNecessaryMode();
+            }
+            break;
+        }
+        default:
+            break;
+    }
+
+    /* Call to base-class: */
+    UIMachineWindow::changeEvent(pEvent);
+}
+#endif /* VBOX_WS_X11 && QT_VERSION >= 0x050000 */
+
 #ifdef VBOX_WS_WIN
 # if QT_VERSION >= 0x050000

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

@@ -74 +74 @@
 #endif /* VBOX_WS_WIN || VBOX_WS_X11 */
 
+#if defined(VBOX_WS_X11) && QT_VERSION >= 0x050000
+    /** Handles @a pEvent about state change. */
+    void changeEvent(QEvent *pEvent);
+#endif /* VBOX_WS_X11 && QT_VERSION >= 0x050000 */
+
 #ifdef VBOX_WS_WIN
 # if QT_VERSION >= 0x050000
@@ -101 +106 @@
       * Used to restore minimized state when the window shown again. */
     bool m_fWasMinimized;
+#if defined(VBOX_WS_X11) && QT_VERSION >= 0x050000
+    /** Holds whether the window is currently minimized.
+      * Used to restore maximized state when the window restored again. */
+    bool m_fIsMinimized;
+#endif /* VBOX_WS_X11 && QT_VERSION >= 0x050000 */
 
     /** Factory support. */