Changeset 56701 in vbox for trunk

Timestamp:

Jun 30, 2015 2:58:12 PM (9 years ago)

Author:

vboxsync

Message:

FE/Qt: 7844: Some cleanup in corresponding code.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• extradata/UIExtraDataManager.cpp (modified) (2 diffs)
• extradata/UIExtraDataManager.h (modified) (1 diff)
• runtime/UIMachineView.cpp (modified) (4 diffs)
• runtime/UIMachineView.h (modified) (1 diff)
• runtime/normal/UIMachineViewNormal.cpp (modified) (2 diffs)
• runtime/scale/UIMachineViewScale.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataManager.cpp

@@ -3072 +3072 @@
 }
 
-QSize UIExtraDataManager::lastGuestSizeHint(ulong uScreenIndex, const QString &strID)
+QSize UIExtraDataManager::lastGuestScreenSizeHint(ulong uScreenIndex, const QString &strID)
 {
     /* Choose corresponding key: */
@@ -3096 +3096 @@
 }
 
-void UIExtraDataManager::setLastGuestSizeHint(ulong uScreenIndex, const QSize &sizeHint, const QString &strID)
+void UIExtraDataManager::setLastGuestScreenSizeHint(ulong uScreenIndex, const QSize &sizeHint, const QString &strID)
 {
     /* Choose corresponding key: */

trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataManager.h

@@ -380 +380 @@
 
         /** Returns last guest-screen size-hint for screen with @a uScreenIndex. */
-        QSize lastGuestSizeHint(ulong uScreenIndex, const QString &strID);
+        QSize lastGuestScreenSizeHint(ulong uScreenIndex, const QString &strID);
         /** Defines last guest-screen @a sizeHint for screen with @a uScreenIndex. */
-        void setLastGuestSizeHint(ulong uScreenIndex, const QSize &sizeHint, const QString &strID);
+        void setLastGuestScreenSizeHint(ulong uScreenIndex, const QSize &sizeHint, const QString &strID);
 
         /** Returns host-screen index corresponding to passed guest-screen @a iGuestScreenIndex. */

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

@@ -659 +659 @@
          * On X11 this will be additional done when the machine state was 'saved'. */
         if (machine().GetState() == KMachineState_Saved)
-            size = guestSizeHint();
+            size = guestScreenSizeHint();
 #endif /* Q_WS_X11 */
 
@@ -923 +923 @@
 }
 
-QSize UIMachineView::guestSizeHint()
+QSize UIMachineView::guestScreenSizeHint() const
 {
     /* Load guest-screen size-hint: */
-    QSize size = gEDataManager->lastGuestSizeHint(m_uScreenId, vboxGlobal().managedVMUuid());
+    QSize sizeHint = gEDataManager->lastGuestScreenSizeHint(m_uScreenId, vboxGlobal().managedVMUuid());
 
     /* Invent the default if necessary: */
-    if (!size.isValid())
-        size = QSize(800, 600);
+    if (!sizeHint.isValid())
+        sizeHint = QSize(800, 600);
 
     /* Take the scale-factor(s) into account: */
-    size = scaledForward(size);
-
-    /* Return size: */
-    return size;
+    sizeHint = scaledForward(sizeHint);
+
+    /* Return size-hint: */
+    return sizeHint;
+}
+
+void UIMachineView::storeGuestSizeHint(const QSize &sizeHint)
+{
+    /* Save guest-screen size-hint: */
+    LogRel(("GUI: UIMachineView::storeGuestSizeHint: "
+            "Storing guest-screen size-hint for screen %d as %dx%d\n",
+            (int)screenId(), sizeHint.width(), sizeHint.height()));
+    gEDataManager->setLastGuestScreenSizeHint(m_uScreenId, sizeHint, vboxGlobal().managedVMUuid());
 }
 
@@ -983 +992 @@
     LogRelFlow(("GUI: UIMachineView::handleScaleChange: Complete for Screen=%d\n",
                 (unsigned long)m_uScreenId));
-}
-
-void UIMachineView::storeGuestSizeHint(const QSize &size)
-{
-    /* Save guest-screen size-hint: */
-    LogRel(("GUI: UIMachineView::storeGuestSizeHint: "
-            "Storing guest size-hint for screen %d as %dx%d\n",
-            (int)screenId(), size.width(), size.height()));
-    gEDataManager->setLastGuestSizeHint(m_uScreenId, size, vboxGlobal().managedVMUuid());
 }
 
@@ -1059 +1059 @@
 
     /* Create a screen-shot on the basis of the screen-data we have in saved-state: */
-    QImage screenShot = QImage::fromData(screenData.data(), screenData.size(), "PNG").scaled(uGuestWidth > 0 ? QSize(uGuestWidth, uGuestHeight) : guestSizeHint());
+    QImage screenShot = QImage::fromData(screenData.data(), screenData.size(), "PNG").scaled(uGuestWidth > 0 ? QSize(uGuestWidth, uGuestHeight) : guestScreenSizeHint());
 
     /* Dim screen-shot if it is Ok: */

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

@@ -209 +209 @@
      * @sa m_u64MaxGuestSize. */
     QSize maxGuestSize();
-    /** Retrieve the last non-fullscreen guest size hint (from extra data).
-     */
-    QSize guestSizeHint();
+
+    /** Retrieves the last guest-screen size-hint from extra-data. */
+    QSize guestScreenSizeHint() const;
+    /** Stores a guest-screen size-hint to extra-data. */
+    void storeGuestSizeHint(const QSize &sizeHint);
 
     /** Handles machine-view scale changes. */
     void handleScaleChange();
-
-    /* Protected setters: */
-    /** Store a guest size hint value to extra data, called on switching to
-     * fullscreen. */
-    void storeGuestSizeHint(const QSize &size);
 
     /** Returns the pause-pixmap: */

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

@@ -137 +137 @@
 void UIMachineViewNormal::resendSizeHint()
 {
-    /* Get the last size hint, taking the scale factor into account. */
-    const QSize sizeHint = scaledBackward(guestSizeHint());
+    /* Get the last guest-screen size-hint, taking the scale factor into account. */
+    const QSize sizeHint = scaledBackward(guestScreenSizeHint());
     LogRel(("GUI: UIMachineViewNormal::resendSizeHint: Restoring guest size-hint for screen %d to %dx%d\n",
             (int)screenId(), sizeHint.width(), sizeHint.height()));
+
+    /* Expand current limitations: */
+    setMaxGuestSize(sizeHint);
+
     if (uisession()->isGuestSupportsGraphics())
     {
@@ -150 +154 @@
         m_sizeHintOverride = sizeHint;
     }
-    /** @todo What if not m_bIsGuestAutoresizeEnabled?  Just let the guest start
-     *        at the default 800x600? */
-    display().SetVideoModeHint(screenId(), true, false, 0, 0, sizeHint.width(), sizeHint.height(), 0);
+
+    /* Send saved size-hint to the guest: */
+    /// @todo What if not m_bIsGuestAutoresizeEnabled?
+    ///       Just let the guest start at the default 800x600?
+    display().SetVideoModeHint(screenId(),
+                               true /* temporary decision */,
+                               false, 0, 0, sizeHint.width(), sizeHint.height(), 0);
 }
 

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

@@ -153 +153 @@
 void UIMachineViewScale::resendSizeHint()
 {
-    const QSize sizeHint = scaledBackward(guestSizeHint());
+    /* Get the last guest-screen size-hint, taking the scale factor into account. */
+    const QSize sizeHint = scaledBackward(guestScreenSizeHint());
     LogRel(("GUI: UIMachineViewScale::resendSizeHint: Restoring guest size-hint for screen %d to %dx%d\n",
             (int)screenId(), sizeHint.width(), sizeHint.height()));
+
     /* Expand current limitations: */
     setMaxGuestSize(sizeHint);
-    display().SetVideoModeHint(screenId(), true, false, 0, 0, sizeHint.width(), sizeHint.height(), 0);
+
+    /* Send saved size-hint to the guest: */
+    display().SetVideoModeHint(screenId(),
+                               true /* temporary decision */,
+                               false, 0, 0, sizeHint.width(), sizeHint.height(), 0);
 }