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

Timestamp:

May 29, 2012 5:13:41 PM (13 years ago)

Author:

vboxsync

Message:

FE/Qt: 5820: Make sure window visibility state persist through visual representation mode change.

Location:

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

Files:

• UIMachineWindow.cpp (modified) (2 diffs)
• UIMachineWindow.h (modified) (1 diff)
• UISession.cpp (modified) (3 diffs)
• UISession.h (modified) (4 diffs)
• fullscreen/UIMachineWindowFullscreen.cpp (modified) (2 diffs)
• normal/UIMachineWindowNormal.cpp (modified) (1 diff)
• scale/UIMachineWindowScale.cpp (modified) (1 diff)
• seamless/UIMachineWindowSeamless.cpp (modified) (2 diffs)

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

@@ -163 +163 @@
     /* Process KGuestMonitorChangedEventType_Enabled change event: */
     if (isHidden() && changeType == KGuestMonitorChangedEventType_Enabled)
-        showInNecessaryMode();
+        uisession()->setScreenVisible(m_uScreenId, true);
     /* Process KGuestMonitorChangedEventType_Disabled change event: */
     else if (!isHidden() && changeType == KGuestMonitorChangedEventType_Disabled)
-        hide();
+        uisession()->setScreenVisible(m_uScreenId, false);
+
+    /* Update screen visibility status: */
+    showInNecessaryMode();
 }
 
@@ -612 +615 @@
 #endif /* VBOX_WITH_DEBUGGER_GUI */
 
-bool UIMachineWindow::shouldWeShowWindow() const
-{
-    /* By default, every window should be shown: */
-    bool fResult = true;
-    /* But if machine is 'turned off': */
-    if (uisession()->isTurnedOff())
-    {
-        /* If machine is in 'saved' state: */
-        if (uisession()->isSaved())
-        {
-            /* We are getting shown-state from saved-state: */
-            BOOL fEnabled = true;
-            ULONG guestOriginX = 0, guestOriginY = 0, guestWidth = 0, guestHeight = 0;
-            machine().QuerySavedGuestScreenInfo(m_uScreenId, guestOriginX, guestOriginY, guestWidth, guestHeight, fEnabled);
-            fResult = fEnabled;
-        }
-        /* If machine is in 'powered off', 'teleported' or 'aborted' state: */
-        else
-        {
-            /* Shown-state is 'enabled' only for 1st monitor: */
-            fResult = m_uScreenId == 0;
-        }
-    }
-    return fResult;
-}
-
 /* static */
 Qt::WindowFlags UIMachineWindow::windowFlags(UIVisualStateType visualStateType)

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

@@ -109 +109 @@
 
     /* Helpers: */
-    bool shouldWeShowWindow() const;
     const QString& defaultWindowTitle() const { return m_strWindowTitlePrefix; }
     static Qt::WindowFlags windowFlags(UIVisualStateType visualStateType);

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UISession.cpp

@@ -92 +92 @@
     prepareConsoleEventHandlers();
 
+    /* Prepare screens: */
+    prepareScreens();
+
     /* Prepare framebuffers: */
     prepareFramebuffers();
@@ -655 +658 @@
 }
 
+void UISession::prepareScreens()
+{
+    /* Get machine: */
+    CMachine machine = m_session.GetMachine();
+
+    /* Prepare initial screen visibility status: */
+    m_monitorVisibilityVector.resize(machine.GetMonitorCount());
+    m_monitorVisibilityVector.fill(false);
+    m_monitorVisibilityVector[0] = true;
+
+    /* If machine is in 'saved' state: */
+    if (isSaved())
+    {
+        /* Update screen visibility status from saved-state: */
+        for (int i = 0; i < m_monitorVisibilityVector.size(); ++i)
+        {
+            BOOL fEnabled = true;
+            ULONG guestOriginX = 0, guestOriginY = 0, guestWidth = 0, guestHeight = 0;
+            machine.QuerySavedGuestScreenInfo(i, guestOriginX, guestOriginY, guestWidth, guestHeight, fEnabled);
+            m_monitorVisibilityVector[i] = fEnabled;
+        }
+    }
+}
+
 void UISession::prepareFramebuffers()
 {
@@ -1073 +1100 @@
 }
 
+bool UISession::isScreenVisible(ulong uScreenId) const
+{
+    Assert(uScreenId < (ulong)m_monitorVisibilityVector.size());
+    return m_monitorVisibilityVector.value((int)uScreenId, false);
+}
+
+void UISession::setScreenVisible(ulong uScreenId, bool fIsMonitorVisible)
+{
+    Assert(uScreenId < (ulong)m_monitorVisibilityVector.size());
+    if (uScreenId < (ulong)m_monitorVisibilityVector.size())
+        m_monitorVisibilityVector[(int)uScreenId] = fIsMonitorVisible;
+}
+
 UIFrameBuffer* UISession::frameBuffer(ulong uScreenId) const
 {

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

@@ -147 +147 @@
     void setMouseIntegrated(bool fIsMouseIntegrated) { m_fIsMouseIntegrated = fIsMouseIntegrated; }
 
+    /* Screen visibility status: */
+    bool isScreenVisible(ulong uScreenId) const;
+    void setScreenVisible(ulong uScreenId, bool fIsMonitorVisible);
+
     /* Returns existing framebuffer for the given screen-number;
      * Returns 0 (asserts) if screen-number attribute is out of bounds: */
@@ -202 +206 @@
     /* Prepare helpers: */
     void prepareConsoleEventHandlers();
+    void prepareScreens();
     void prepareFramebuffers();
     void prepareMenuPool();
@@ -210 +215 @@
     void cleanupMenuPool();
     void cleanupFramebuffers();
+    //void cleanupSession() {}
     void cleanupConsoleEventHandlers();
 
@@ -227 +233 @@
 
     UIMachineMenuBar *m_pMenuPool;
+
+    /* Screen visibility vector: */
+    QVector<bool> m_monitorVisibilityVector;
 
     /* Frame-buffers vector: */

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

@@ -166 +166 @@
 {
     /* Show window if we have to: */
-    if (shouldWeShowWindow())
+    if (uisession()->isScreenVisible(m_uScreenId))
     {
         /* Make sure the window is placed on valid screen
@@ -186 +186 @@
 #endif /* Q_WS_MAC */
     }
+    /* Else hide window: */
+    else hide();
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/runtime/normal/UIMachineWindowNormal.cpp

@@ -506 +506 @@
 {
     /* Show window if we have to: */
-    if (shouldWeShowWindow())
+    if (uisession()->isScreenVisible(m_uScreenId))
         show();
+    /* Else hide window: */
+    else
+        hide();
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/runtime/scale/UIMachineWindowScale.cpp

@@ -200 +200 @@
 {
     /* Show window if we have to: */
-    if (shouldWeShowWindow())
+    if (uisession()->isScreenVisible(m_uScreenId))
         show();
+    /* Else hide window: */
+    else
+        hide();
 }
 

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

@@ -220 +220 @@
 {
     /* Show window if we have to: */
-    if (shouldWeShowWindow())
+    if (uisession()->isScreenVisible(m_uScreenId))
     {
         /* Show manually maximized window: */
@@ -235 +235 @@
 #endif /* Q_WS_MAC */
     }
+    /* Else hide window: */
+    else hide();
 }