Changeset 52382 in vbox for trunk/src/VBox/Frontends/VirtualBox

Timestamp:

Aug 14, 2014 1:27:19 PM (11 years ago)

Author:

vboxsync

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

95525

Message:

FE/Qt: Runtime UI: Make sure mini-toolbar of hidden machine-window is hidden too; merging latest changes from full-screen to seamless mode.

Location:

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

Files:

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

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

@@ -166 +166 @@
 void UIMachineWindowFullscreen::sltRevokeFocus()
 {
+    /* Make sure window is visible: */
+    if (!isVisible())
+        return;
+
     /* Revoke stolen focus: */
     m_pMachineView->setFocus();
@@ -314 +318 @@
     if (!uisession()->isScreenVisible(m_uScreenId) ||
         !pFullscreenLogic->hasHostScreenForGuestScreen(m_uScreenId))
-        return hide();
+    {
+        /* Hide mini-toolbar: */
+        if (m_pMiniToolBar)
+            m_pMiniToolBar->hide();
+        /* Hide window: */
+        hide();
+        return;
+    }
 
     /* Make sure this window is not minimized: */
@@ -368 +379 @@
     machineView()->maybeAdjustGuestScreenSize();
 
-    /* Move mini-toolbar into appropriate place: */
+    /* Show/Move mini-toolbar into appropriate place: */
     if (m_pMiniToolBar)
+    {
+        m_pMiniToolBar->show();
         m_pMiniToolBar->adjustGeometry(iHostScreen);
+    }
 }
 

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

@@ -63 +63 @@
 void UIMachineWindowSeamless::sltRevokeFocus()
 {
+    /* Make sure window is visible: */
+    if (!isVisible())
+        return;
+
     /* Revoke stolen focus: */
     m_pMachineView->setFocus();
@@ -158 +162 @@
     /* Calculate working area: */
     QRect workingArea = vboxGlobal().availableGeometry(iScreen);
+
     /* Move to the appropriate position: */
     move(workingArea.topLeft());
+
     /* Resize to the appropriate size: */
     resize(workingArea.size());
+}
+
+void UIMachineWindowSeamless::showInNecessaryMode()
+{
+    /* Make sure this window has seamless logic: */
+    UIMachineLogicSeamless *pSeamlessLogic = qobject_cast<UIMachineLogicSeamless*>(machineLogic());
+    AssertPtrReturnVoid(pSeamlessLogic);
+
+    /* Make sure this window should be shown and mapped to some host-screen: */
+    if (!uisession()->isScreenVisible(m_uScreenId) ||
+        !pSeamlessLogic->hasHostScreenForGuestScreen(m_uScreenId))
+    {
+#ifndef Q_WS_MAC
+        /* Hide mini-toolbar: */
+        if (m_pMiniToolBar)
+            m_pMiniToolBar->hide();
+#endif /* !Q_WS_MAC */
+        /* Hide window: */
+        hide();
+        return;
+    }
+
+    /* Make sure this window is not minimized: */
+    if (isMinimized())
+        return;
+
+    /* Make sure this window is maximized and placed on valid screen: */
+    placeOnScreen();
+
+    /* Show in normal mode: */
+    show();
+
     /* Adjust guest screen size if necessary: */
     machineView()->maybeAdjustGuestScreenSize();
-#ifndef Q_WS_MAC
-    /* Move mini-toolbar into appropriate place: */
+
+#ifndef Q_WS_MAC
+    /* Show/Move mini-toolbar into appropriate place: */
     if (m_pMiniToolBar)
+    {
+        m_pMiniToolBar->show();
         m_pMiniToolBar->adjustGeometry();
-#endif /* !Q_WS_MAC */
-}
-
-void UIMachineWindowSeamless::showInNecessaryMode()
-{
-    /* Make sure this window should be shown at all: */
-    if (!uisession()->isScreenVisible(m_uScreenId))
-        return hide();
-
-    /* Make sure this window has seamless logic: */
-    UIMachineLogicSeamless *pSeamlessLogic = qobject_cast<UIMachineLogicSeamless*>(machineLogic());
-    if (!pSeamlessLogic)
-        return hide();
-
-    /* Make sure this window mapped to some host-screen: */
-    if (!pSeamlessLogic->hasHostScreenForGuestScreen(m_uScreenId))
-        return hide();
-
-    /* Make sure this window is not minimized: */
-    if (isMinimized())
-        return;
-
-    /* Make sure this window is maximized and placed on valid screen: */
-    placeOnScreen();
-
-    /* Show in normal mode: */
-    show();
+    }
+#endif /* !Q_WS_MAC */
 }