Changeset 57016 in vbox for trunk/src/VBox

Timestamp:

Jul 20, 2015 10:22:54 AM (9 years ago)

Author:

vboxsync

Message:

FE/Qt: Runtime UI: Do not reactivate machine-window when activation/focus lost if it's minimized.

Location:

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

Files:

• UIMachineWindow.h (modified) (1 diff)
• fullscreen/UIMachineWindowFullscreen.cpp (modified) (2 diffs)
• fullscreen/UIMachineWindowFullscreen.h (modified) (1 diff)
• seamless/UIMachineWindowSeamless.cpp (modified) (2 diffs)
• seamless/UIMachineWindowSeamless.h (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineWindow.h

@@ -98 +98 @@
     virtual void sltMachineStateChanged();
 
-    /** Shows window minimized. */
-    virtual void showMinimized() { QMainWindow::showMinimized(); }
-
 protected:
 

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

@@ -177 +177 @@
 {
     /* Make sure window is visible: */
-    if (!isVisible())
+    if (!isVisible() || isMinimized())
         return;
 
@@ -187 +187 @@
     activateWindow();
 #endif /* Q_WS_MAC || Q_WS_X11 */
-}
-
-void UIMachineWindowFullscreen::showMinimized()
-{
-#ifdef Q_WS_X11
-    /* If there is mini-toolbar: */
-    if (m_pMiniToolBar)
-    {
-        /* Minimize it first: */
-        m_pMiniToolBar->showMinimized();
-    }
-#endif /* Q_WS_X11 */
-
-    /* Call to base-class: */
-    UIMachineWindow::showMinimized();
 }
 

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

@@ -75 +75 @@
     void sltRevokeFocus();
 
-    /** Shows window minimized. */
-    void showMinimized();
-
 private:
 

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

@@ -68 +68 @@
 {
     /* Make sure window is visible: */
-    if (!isVisible())
+    if (!isVisible() || isMinimized())
         return;
 
@@ -78 +78 @@
     activateWindow();
 #endif /* Q_WS_MAC || Q_WS_X11 */
-}
-
-void UIMachineWindowSeamless::showMinimized()
-{
-#ifdef Q_WS_X11
-    /* If there is mini-toolbar: */
-    if (m_pMiniToolBar)
-    {
-        /* Minimize it first: */
-        m_pMiniToolBar->showMinimized();
-    }
-#endif /* Q_WS_X11 */
-
-    /* Call to base-class: */
-    UIMachineWindow::showMinimized();
 }
 

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

@@ -46 +46 @@
     /** Revokes keyboard-focus. */
     void sltRevokeFocus();
-
-    /** Shows window minimized. */
-    void showMinimized();
 
 private: