Changeset 97978 in vbox

Timestamp:

Jan 4, 2023 2:24:31 PM (2 years ago)

Author:

vboxsync

Message:

FE/Qt: Runtime UI: Unify and a bit simplify acquiring of last guest-screen size-hint for normal and full-screen/seamless modes.

Location:

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

Files:

• UIMachineView.cpp (modified) (1 diff)
• UIMachineView.h (modified) (1 diff)
• fullscreen/UIMachineViewFullscreen.cpp (modified) (3 diffs)
• normal/UIMachineViewNormal.cpp (modified) (1 diff)
• seamless/UIMachineViewSeamless.cpp (modified) (3 diffs)

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

@@ -1266 +1266 @@
 }
 
+QSize UIMachineView::requestedGuestScreenSizeHint() const
+{
+    /* Acquire last guest-screen size-hint 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();
+    }
+
+    /* Return result: */
+    return QSize((int)uWidth, (int)uHeight);
+}
+
 bool UIMachineView::guestScreenVisibilityStatus() const
 {

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

@@ -240 +240 @@
     void setStoredGuestScreenSizeHint(const QSize &sizeHint);
 
+    /** Retrieves the sent guest-screen size-hint from display or frame-buffer. */
+    QSize requestedGuestScreenSizeHint() const;
+
     /** Retrieves the last guest-screen visibility status from extra-data. */
     bool guestScreenVisibilityStatus() const;

trunk/src/VBox/Frontends/VirtualBox/src/runtime/fullscreen/UIMachineViewFullscreen.cpp

@@ -74 +74 @@
                 /* Send guest-resize hint only if top window resizing to required dimension: */
                 QResizeEvent *pResizeEvent = static_cast<QResizeEvent*>(pEvent);
-                if (pResizeEvent->size() != workingArea().size())
+                if (pResizeEvent->size() != calculateMaxGuestSize())
                     break;
 
@@ -150 +150 @@
     if (!fAdjust)
     {
-        /* Acquire frame-buffer size: */
-        QSize frameBufferSize(frameBuffer()->width(), frameBuffer()->height());
+        /* Acquire requested guest-screen size-hint or at least actual frame-buffer size: */
+        QSize guestScreenSizeHint = requestedGuestScreenSizeHint();
         /* Take the scale-factor(s) into account: */
-        frameBufferSize = scaledForward(frameBufferSize);
-
-        /* Acquire working-area size: */
-        const QSize workingAreaSize = workingArea().size();
-
-        if (frameBufferSize != workingAreaSize)
+        guestScreenSizeHint = scaledForward(guestScreenSizeHint);
+
+        /* Calculate maximum possible guest screen size: */
+        const QSize maximumGuestScreenSize = calculateMaxGuestSize();
+
+        if (guestScreenSizeHint != maximumGuestScreenSize)
         {
             LogRel2(("GUI: UIMachineViewFullscreen::adjustGuestScreenSize: Guest-screen is of another size than necessary, adjustment is required.\n"));
@@ -197 +197 @@
     {
         frameBuffer()->setAutoEnabled(false);
-        sltPerformGuestResize(workingArea().size());
+        sltPerformGuestResize(calculateMaxGuestSize());
         /* And remember the size to know what we are resizing out of when we exit: */
-        uisession()->setLastFullScreenSize(screenId(), scaledForward(scaledBackward(workingArea().size())));
+        uisession()->setLastFullScreenSize(screenId(), scaledForward(scaledBackward(calculateMaxGuestSize())));
     }
 }

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

@@ -181 +181 @@
     LogRel(("GUI: UIMachineViewNormal::adjustGuestScreenSize: Adjust guest-screen size if necessary\n"));
 
-    /* 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);
+    /* Acquire requested guest-screen size-hint or at least actual frame-buffer size: */
+    QSize guestScreenSizeHint = requestedGuestScreenSizeHint();
     /* 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 maximumGuestSize = calculateMaxGuestSize();
-    if (   maximumGuestSize.width() < frameBufferSize.width()
-        || maximumGuestSize.height() < frameBufferSize.height())
+    guestScreenSizeHint = scaledForward(guestScreenSizeHint);
+
+    /* Calculate maximum possible guest screen size: */
+    const QSize maximumGuestScreenSize = calculateMaxGuestSize();
+
+    /* Adjust guest-screen size if the requested one is too big for the screen: */
+    if (   guestScreenSizeHint.width() > maximumGuestScreenSize.width()
+        || guestScreenSizeHint.height() > maximumGuestScreenSize.height())
         sltPerformGuestResize(machineWindow()->centralWidget()->size());
 }

trunk/src/VBox/Frontends/VirtualBox/src/runtime/seamless/UIMachineViewSeamless.cpp

@@ -85 +85 @@
                 /* Send guest-resize hint only if top window resizing to required dimension: */
                 QResizeEvent *pResizeEvent = static_cast<QResizeEvent*>(pEvent);
-                if (pResizeEvent->size() != workingArea().size())
+                if (pResizeEvent->size() != calculateMaxGuestSize())
                     break;
 
@@ -163 +163 @@
     if (!fAdjust)
     {
-        /* Acquire frame-buffer size: */
-        QSize frameBufferSize(frameBuffer()->width(), frameBuffer()->height());
+        /* Acquire requested guest-screen size-hint or at least actual frame-buffer size: */
+        QSize guestScreenSizeHint = requestedGuestScreenSizeHint();
         /* Take the scale-factor(s) into account: */
-        frameBufferSize = scaledForward(frameBufferSize);
-
-        /* Acquire working-area size: */
-        const QSize workingAreaSize = workingArea().size();
-
-        if (frameBufferSize != workingAreaSize)
+        guestScreenSizeHint = scaledForward(guestScreenSizeHint);
+
+        /* Calculate maximum possible guest screen size: */
+        const QSize maximumGuestScreenSize = calculateMaxGuestSize();
+
+        if (guestScreenSizeHint != maximumGuestScreenSize)
         {
             LogRel2(("GUI: UIMachineViewSeamless::adjustGuestScreenSize: Guest-screen is of another size than necessary, adjustment is required.\n"));
@@ -201 +201 @@
     {
         frameBuffer()->setAutoEnabled(false);
-        sltPerformGuestResize(workingArea().size());
+        sltPerformGuestResize(calculateMaxGuestSize());
         /* And remember the size to know what we are resizing out of when we exit: */
-        uisession()->setLastFullScreenSize(screenId(), scaledForward(scaledBackward(workingArea().size())));
+        uisession()->setLastFullScreenSize(screenId(), scaledForward(scaledBackward(calculateMaxGuestSize())));
     }
 }