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

Timestamp:

Jun 28, 2019 9:46:46 AM (6 years ago)

Author:

vboxsync

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

131644

Message:

FE/Qt: UIMachineViewNormal: base adjust guest screen size on last size hint.
bugref:9482: FE/Qt and Additions/WINNT: move away from *adjust size...*
At regular intervals the GUI performs checks to see if it should send the
guest machine a new preferred size. Up until now this has been done if the
current size of the guest screen is too large for the host screen it is
located on. However this triggered unwanted resizes as the check was also
performed when the guest enabled dynamic resizing, but before it was able
to set a size itself. This change modifies the behaviour, so that the GUI
now checks whether the last set preferred size for the guest screen will fit
on the host screen.

File:

• trunk/src/VBox/Frontends/VirtualBox/src/runtime/normal/UIMachineViewNormal.cpp (modified) (1 diff)

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

@@ -179 +179 @@
 void UIMachineViewNormal::adjustGuestScreenSize()
 {
-    /* Should we adjust guest-screen size? Logging paranoia is required here to reveal the truth. */
     LogRel(("GUI: UIMachineViewNormal::adjustGuestScreenSize: Adjust guest-screen size if necessary\n"));
-    bool fAdjust = false;
-
-    /* Step 1: Is the guest-screen of another size than necessary? */
-    if (!fAdjust)
-    {
-        /* Acquire frame-buffer size: */
-        QSize frameBufferSize(frameBuffer()->width(), frameBuffer()->height());
-        /* Take the scale-factor(s) into account: */
-        frameBufferSize = scaledForward(frameBufferSize);
-
-        /* Acquire central-widget size: */
-        const QSize centralWidgetSize = machineWindow()->centralWidget()->size();
-
-        if (frameBufferSize != centralWidgetSize)
-        {
-            LogRel2(("GUI: UIMachineViewNormal::adjustGuestScreenSize: Guest-screen is of another size than necessary, adjustment is required.\n"));
-            fAdjust = true;
-        }
-    }
-
-    /* Step 2: Is guest-additions supports graphics? */
-    if (fAdjust)
-    {
-        if (!uisession()->isGuestSupportsGraphics())
-        {
-            LogRel2(("GUI: UIMachineViewNormal::adjustGuestScreenSize: Guest-additions are not supporting graphics, adjustment is omitted.\n"));
-            fAdjust = false;
-        }
-    }
-    /* Step 3: Is guest-screen visible? */
-    if (fAdjust)
-    {
-        if (!uisession()->isScreenVisible(screenId()))
-        {
-            LogRel2(("GUI: UIMachineViewNormal::adjustGuestScreenSize: Guest-screen is not visible, adjustment is omitted.\n"));
-            fAdjust = false;
-        }
-    }
-    /* Step 4: Is guest-screen auto-resize enabled? */
-    if (fAdjust)
-    {
-        if (!m_bIsGuestAutoresizeEnabled)
-        {
-            LogRel2(("GUI: UIMachineViewNormal::adjustGuestScreenSize: Guest-screen auto-resize is disabled, adjustment is omitted.\n"));
-            fAdjust = false;
-        }
-    }
-    /* Step 5: Is another visual representation mode requested? */
-    if (fAdjust)
-    {
-        if (uisession()->requestedVisualState() == UIVisualStateType_Seamless) // Seamless only for now.
-        {
-            LogRel2(("GUI: UIMachineViewNormal::adjustGuestScreenSize: Seamless mode is requested, adjustment is omitted.\n"));
-            fAdjust = false;
-        }
-    }
-
-    /* Final step: Adjust if requested/allowed. */
-    if (fAdjust)
-    {
+
+    /* Get last monitor size set, if any: */
+    BOOL fEnabled, fChangeOrigin;
+    LONG iOriginX, iOriginY;
+    ULONG uWidth, uHeight, uBitsPerPixel;
+    display().GetVideoModeHint(screenId(), fEnabled, fChangeOrigin,
+                               iOriginX, iOriginY, uWidth, uHeight, uBitsPerPixel);
+
+    /* Acquire effective frame-buffer size otherwise: */
+    if (uWidth == 0 || uHeight == 0)
+    {
+        uWidth = frameBuffer()->width();
+        uHeight = frameBuffer()->height();
+    }
+
+    /* Compose frame-buffer size: */
+    QSize frameBufferSize(uWidth, uHeight);
+    /* Take the scale-factor(s) into account: */
+    frameBufferSize = scaledForward(frameBufferSize);
+
+    /* Adjust guest-screen size if the last size hint is too big for the screen: */
+    const QSize maxGuestSize = calculateMaxGuestSize();
+    if (   maxGuestSize.width() < frameBufferSize.width()
+        || maxGuestSize.height() < frameBufferSize.height())
         sltPerformGuestResize(machineWindow()->centralWidget()->size());
-    }
 }