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

Timestamp:

Feb 16, 2017 1:20:32 PM (8 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

113533

Message:

FE/Qt: X11: Runtime UI: Prevent instant restore to full-screen/seamless modes right after minimization call; issue caused by async minimization handling.

Location:

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

Files:

• fullscreen/UIMachineWindowFullscreen.cpp (modified) (5 diffs)
• fullscreen/UIMachineWindowFullscreen.h (modified) (2 diffs)
• seamless/UIMachineWindowSeamless.cpp (modified) (5 diffs)
• seamless/UIMachineWindowSeamless.h (modified) (2 diffs)

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

@@ -61 +61 @@
     , m_fWasMinimized(false)
 #ifdef VBOX_WS_X11
+    , m_fIsMinimizationRequested(false)
     , m_fIsMinimized(false)
 #endif
@@ -136 +137 @@
 void UIMachineWindowFullscreen::sltRevokeWindowActivation()
 {
+#ifdef VBOX_WS_X11
+    // WORKAROUND:
+    // We could be asked to minimize already, but just
+    // not yet executed that order to current moment.
+    if (m_fIsMinimizationRequested)
+        return;
+#endif
+
     /* Make sure window is visible: */
     if (!isVisible() || isMinimized())
@@ -198 +207 @@
 }
 #endif /* VBOX_WS_MAC */
+
+void UIMachineWindowFullscreen::sltShowMinimized()
+{
+#ifdef VBOX_WS_X11
+    /* Remember that we are asked to minimize: */
+    m_fIsMinimizationRequested = true;
+#endif
+
+    showMinimized();
+}
 
 void UIMachineWindowFullscreen::prepareVisualState()
@@ -261 +280 @@
         m_pMiniToolBar->addMenus(actionPool()->menus());
         connect(m_pMiniToolBar, SIGNAL(sigMinimizeAction()),
-                this, SLOT(showMinimized()), Qt::QueuedConnection);
+                this, SLOT(sltShowMinimized()), Qt::QueuedConnection);
         connect(m_pMiniToolBar, SIGNAL(sigExitAction()),
                 actionPool()->action(UIActionIndexRT_M_View_T_Fullscreen), SLOT(trigger()));
@@ -564 +583 @@
                 LogRel2(("GUI: UIMachineWindowFullscreen::changeEvent: Window restored\n"));
                 m_fIsMinimized = false;
+                /* Remember that we no more asked to minimize: */
+                m_fIsMinimizationRequested = false;
                 showInNecessaryMode();
             }

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

@@ -76 +76 @@
 #endif /* RT_OS_DARWIN */
 
+    /** Shows window in minimized state. */
+    void sltShowMinimized();
+
 private:
 
@@ -128 +131 @@
     bool m_fWasMinimized;
 #ifdef VBOX_WS_X11
+    /** X11: Holds whether the window minimization is currently requested.
+      * Used to prevent accidentally restoring to full-screen state. */
+    bool m_fIsMinimizationRequested;
     /** X11: Holds whether the window is currently minimized.
       * Used to restore full-screen state when the window restored again. */

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

@@ -53 +53 @@
     , m_fWasMinimized(false)
 #ifdef VBOX_WS_X11
+    , m_fIsMinimizationRequested(false)
     , m_fIsMinimized(false)
 #endif
@@ -70 +71 @@
 void UIMachineWindowSeamless::sltRevokeWindowActivation()
 {
+#ifdef VBOX_WS_X11
+    // WORKAROUND:
+    // We could be asked to minimize already, but just
+    // not yet executed that order to current moment.
+    if (m_fIsMinimizationRequested)
+        return;
+#endif
+
     /* Make sure window is visible: */
     if (!isVisible() || isMinimized())
@@ -81 +90 @@
 }
 #endif /* VBOX_WS_WIN || VBOX_WS_X11 */
+
+void UIMachineWindowSeamless::sltShowMinimized()
+{
+#ifdef VBOX_WS_X11
+    /* Remember that we are asked to minimize: */
+    m_fIsMinimizationRequested = true;
+#endif
+
+    showMinimized();
+}
 
 void UIMachineWindowSeamless::prepareVisualState()
@@ -125 +144 @@
         m_pMiniToolBar->addMenus(actionPool()->menus());
         connect(m_pMiniToolBar, SIGNAL(sigMinimizeAction()),
-                this, SLOT(showMinimized()), Qt::QueuedConnection);
+                this, SLOT(sltShowMinimized()), Qt::QueuedConnection);
         connect(m_pMiniToolBar, SIGNAL(sigExitAction()),
                 actionPool()->action(UIActionIndexRT_M_View_T_Seamless), SLOT(trigger()));
@@ -323 +342 @@
                 LogRel2(("GUI: UIMachineWindowSeamless::changeEvent: Window restored\n"));
                 m_fIsMinimized = false;
+                /* Remember that we no more asked to minimize: */
+                m_fIsMinimizationRequested = false;
                 showInNecessaryMode();
             }

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

@@ -47 +47 @@
     void sltRevokeWindowActivation();
 #endif /* VBOX_WS_WIN || VBOX_WS_X11 */
+
+    /** Shows window in minimized state. */
+    void sltShowMinimized();
 
 private:
@@ -105 +108 @@
     bool m_fWasMinimized;
 #ifdef VBOX_WS_X11
+    /** X11: Holds whether the window minimization is currently requested.
+      * Used to prevent accidentally restoring to seamless state. */
+    bool m_fIsMinimizationRequested;
     /** X11: Holds whether the window is currently minimized.
       * Used to restore maximized state when the window restored again. */