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

Timestamp:

Feb 26, 2013 1:45:12 PM (12 years ago)

Author:

vboxsync

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

83967

Message:

FE/Qt: Multi-screen support: Cleanup multi-screen layout (part 2).

Location:

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

Files:

• UIMultiScreenLayout.cpp (modified) (2 diffs)
• UIMultiScreenLayout.h (modified) (1 diff)

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

@@ -44 +44 @@
 {
     /* Calculate host/guest screen count: */
-    CMachine machine = m_pMachineLogic->session().GetMachine();
-    /* Get host/guest monitor count: */
-#if (QT_VERSION >= 0x040600)
-    m_cHostScreens = QApplication::desktop()->screenCount();
-#else /* (QT_VERSION >= 0x040600) */
-    m_cHostScreens = QApplication::desktop()->numScreens();
-#endif /* !(QT_VERSION >= 0x040600) */
-    m_cGuestScreens = machine.GetMonitorCount();
+    calculateHostMonitorCount();
+    calculateGuestScreenCount();
 }
 
@@ -275 +269 @@
 }
 
+void UIMultiScreenLayout::calculateHostMonitorCount()
+{
+#if (QT_VERSION >= 0x040600)
+    m_cHostScreens = QApplication::desktop()->screenCount();
+#else /* (QT_VERSION >= 0x040600) */
+    m_cHostScreens = QApplication::desktop()->numScreens();
+#endif /* !(QT_VERSION >= 0x040600) */
+}
+
+void UIMultiScreenLayout::calculateGuestScreenCount()
+{
+    CMachine machine = m_pMachineLogic->session().GetMachine();
+    m_cGuestScreens = machine.GetMonitorCount();
+}
+
 quint64 UIMultiScreenLayout::memoryRequirements(const QMap<int, int> *pScreenLayout) const
 {

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

@@ -65 +65 @@
 private:
 
+    /* Helpers: Prepare stuff: */
+    void calculateHostMonitorCount();
+    void calculateGuestScreenCount();
+
     /* Other helpers: */
     quint64 memoryRequirements(const QMap<int, int> *pScreenLayout) const;