Changeset 63328 in vbox

Timestamp:

Aug 11, 2016 11:34:03 AM (8 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:8422: Desktop-widget watchdog rework (part 17): Leave the initial available-geometry null, that way we can distinguish the cases when it was 1. initially calculated and 2. recalculated after that; Send recalculated signal only in second case.

File:

• trunk/src/VBox/Frontends/VirtualBox/src/globals/UIDesktopWidgetWatchdog.cpp (modified) (5 diffs)

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

@@ -207 +207 @@
 
 #ifdef VBOX_WS_X11
-    /* Return cached available-geometry: */
-    return m_availableGeometryData.value(iHostScreenIndex);
+    /* Get cached available-geometry: */
+    const QRect availableGeometry = m_availableGeometryData.value(iHostScreenIndex);
+    /* Return cached available-geometry if it's valid or screen-geometry otherwise: */
+    return availableGeometry.isValid() ? availableGeometry :
+           QApplication::desktop()->screenGeometry(iHostScreenIndex);
 #else /* !VBOX_WS_X11 */
     /* Redirect call to desktop-widget: */
@@ -360 +363 @@
 
     /* Apply received data: */
+    const bool fSendSignal = m_availableGeometryData.value(iHostScreenIndex).isValid();
     m_availableGeometryData[iHostScreenIndex] = availableGeometry;
     /* Forget finished worker: */
@@ -368 +372 @@
 
     /* Notify listeners: */
-    emit sigHostScreenWorkAreaRecalculated(iHostScreenIndex);
+    if (fSendSignal)
+        emit sigHostScreenWorkAreaRecalculated(iHostScreenIndex);
 }
 #endif /* VBOX_WS_X11 */
@@ -439 +444 @@
         /* Get the screen-geometry: */
         const QRect hostScreenGeometry = screenGeometry(iHostScreenIndex);
-        /* Use the screen-geometry as the temporary value for available-geometry: */
-        m_availableGeometryData[iHostScreenIndex] = hostScreenGeometry;
 
         /* Connect worker listener: */
@@ -457 +460 @@
     /* Destroy existing workers: */
     qDeleteAll(m_availableGeometryWorkers);
-    /* And clear their vectors: */
+    /* And clear their vector: */
     m_availableGeometryWorkers.clear();
-    m_availableGeometryData.clear();
 }