Changeset 62998 in vbox for trunk/src/VBox/Frontends

Timestamp:

Aug 4, 2016 3:29:10 PM (8 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:8422: Desktop-widget watchdog rework (part 06): Do not cache host-screen count.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/globals

Files:

• UIDesktopWidgetWatchdog.cpp (modified) (8 diffs)
• UIDesktopWidgetWatchdog.h (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/globals/UIDesktopWidgetWatchdog.cpp

@@ -109 +109 @@
     : QObject(pParent)
     , m_pDesktopWidget(QApplication::desktop())
-    , m_cHostScreenCount(-1)
 {
     /* Prepare: */
@@ -121 +120 @@
 }
 
+int UIDesktopWidgetWatchdog::screenCount() const
+{
+    /* Redirect call to desktop-widget: */
+    return QApplication::desktop()->screenCount();
+}
+
 const QRect UIDesktopWidgetWatchdog::screenGeometry(int iHostScreenIndex /* = -1 */) const
 {
     /* Make sure index is valid: */
-    if (iHostScreenIndex < 0 || iHostScreenIndex >= m_cHostScreenCount)
+    if (iHostScreenIndex < 0 || iHostScreenIndex >= screenCount())
         iHostScreenIndex = m_pDesktopWidget->primaryScreen();
-    AssertReturn(iHostScreenIndex >= 0 && iHostScreenIndex < m_cHostScreenCount, QRect());
+    AssertReturn(iHostScreenIndex >= 0 && iHostScreenIndex < screenCount(), QRect());
 
     /* Redirect call to desktop-widget: */
@@ -135 +140 @@
 {
     /* Make sure index is valid: */
-    if (iHostScreenIndex < 0 || iHostScreenIndex >= m_cHostScreenCount)
+    if (iHostScreenIndex < 0 || iHostScreenIndex >= screenCount())
         iHostScreenIndex = m_pDesktopWidget->primaryScreen();
-    AssertReturn(iHostScreenIndex >= 0 && iHostScreenIndex < m_cHostScreenCount, QRect());
+    AssertReturn(iHostScreenIndex >= 0 && iHostScreenIndex < screenCount(), QRect());
 
     /* Return cached available-geometry: */
@@ -157 +162 @@
 void UIDesktopWidgetWatchdog::sltHostScreenAdded(QScreen *pHostScreen)
 {
-//    printf("UIDesktopWidgetWatchdog::sltHostScreenAdded(%d)\n", m_pDesktopWidget->screenCount());
+//    printf("UIDesktopWidgetWatchdog::sltHostScreenAdded(%d)\n", screenCount());
 
     /* Update host-screen configuration: */
@@ -165 +170 @@
 void UIDesktopWidgetWatchdog::sltHostScreenRemoved(QScreen *pHostScreen)
 {
-//    printf("UIDesktopWidgetWatchdog::sltHostScreenRemoved(%d)\n", m_pDesktopWidget->screenCount());
+//    printf("UIDesktopWidgetWatchdog::sltHostScreenRemoved(%d)\n", screenCount());
 
     /* Update host-screen configuration: */
@@ -228 +233 @@
 {
     /* Acquire new host-screen count: */
-    m_cHostScreenCount = cHostScreenCount != -1 ? cHostScreenCount : m_pDesktopWidget->screenCount();
+    if (cHostScreenCount == -1)
+        cHostScreenCount = screenCount();
 
     /* Cleanup existing workers first: */
@@ -234 +240 @@
 
     /* Resize workers vectors to new host-screen count: */
-    m_availableGeometryWorkers.resize(m_cHostScreenCount);
-    m_availableGeometryData.resize(m_cHostScreenCount);
+    m_availableGeometryWorkers.resize(cHostScreenCount);
+    m_availableGeometryData.resize(cHostScreenCount);
 
     /* Update host-screen available-geometry for each particular host-screen: */
-    for (int iHostScreenIndex = 0; iHostScreenIndex < m_cHostScreenCount; ++iHostScreenIndex)
+    for (int iHostScreenIndex = 0; iHostScreenIndex < cHostScreenCount; ++iHostScreenIndex)
         updateHostScreenAvailableGeometry(iHostScreenIndex);
 }
@@ -245 +251 @@
 {
     /* Make sure index is valid: */
-    if (iHostScreenIndex < 0 || iHostScreenIndex >= m_cHostScreenCount)
+    if (iHostScreenIndex < 0 || iHostScreenIndex >= screenCount())
         iHostScreenIndex = m_pDesktopWidget->primaryScreen();
-    AssertReturnVoid(iHostScreenIndex >= 0 && iHostScreenIndex < m_cHostScreenCount);
+    AssertReturnVoid(iHostScreenIndex >= 0 && iHostScreenIndex < screenCount());
 
     /* Create invisible frame-less window worker: */

trunk/src/VBox/Frontends/VirtualBox/src/globals/UIDesktopWidgetWatchdog.h

@@ -43 +43 @@
     /** Destructs watchdog. */
     ~UIDesktopWidgetWatchdog();
+
+    /** Returns the host-screen count. */
+    int screenCount() const;
 
     /** Returns the geometry of the host-screen with @a iHostScreenIndex.
@@ -89 +92 @@
     QDesktopWidget *m_pDesktopWidget;
 
-    /** Holds current host-screen count. */
-    int m_cHostScreenCount;
     /** Holds current host-screen available-geometries. */
     QVector<QRect> m_availableGeometryData;