Changeset 41598 in vbox for trunk

Timestamp:

Jun 6, 2012 1:42:33 PM (13 years ago)

Author:

vboxsync

Message:

FE/Qt: Make sure at least one machine-window is always visible 1. at startup from saved-state and 2. on getting guest-monitor-change event.

Location:

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

Files:

• UIMachineWindow.cpp (modified) (1 diff)
• UISession.cpp (modified) (2 diffs)
• UISession.h (modified) (1 diff)

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

@@ -167 +167 @@
     /* Ignore KGuestMonitorChangedEventType_NewOrigin change event: */
     if (changeType == KGuestMonitorChangedEventType_NewOrigin)
+        return;
+    /* Ignore KGuestMonitorChangedEventType_Disabled event if there is only one window visible: */
+    AssertMsg(uisession()->countOfVisibleWindows() > 0, ("All machine windows are hidden!"));
+    if ((changeType == KGuestMonitorChangedEventType_Disabled) &&
+        (uisession()->countOfVisibleWindows() == 1))
         return;
 

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

@@ -692 +692 @@
             m_monitorVisibilityVector[i] = fEnabled;
         }
+        /* And make sure at least one of them is visible (primary if others are hidden): */
+        if (countOfVisibleWindows() < 1)
+            m_monitorVisibilityVector[0] = true;
     }
 }
@@ -1126 +1129 @@
 }
 
+int UISession::countOfVisibleWindows()
+{
+    int cCountOfVisibleWindows = 0;
+    for (int i = 0; i < m_monitorVisibilityVector.size(); ++i)
+        if (m_monitorVisibilityVector[i])
+            ++cCountOfVisibleWindows;
+    return cCountOfVisibleWindows;
+}
+
 UIFrameBuffer* UISession::frameBuffer(ulong uScreenId) const
 {

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

@@ -154 +154 @@
     bool isScreenVisible(ulong uScreenId) const;
     void setScreenVisible(ulong uScreenId, bool fIsMonitorVisible);
+    int countOfVisibleWindows();
 
     /* Returns existing framebuffer for the given screen-number;