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

Timestamp:

Jan 5, 2023 1:45:20 PM (2 years ago)

Author:

vboxsync

Message:

FE/Qt: Runtime UI: No need for auto-enabled frame-buffer property since possible request to resize being allowed on the basis of previously sent hint anyway.

Location:

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

Files:

• UIFrameBuffer.cpp (modified) (4 diffs)
• UIFrameBuffer.h (modified) (1 diff)
• UIMultiScreenLayout.cpp (modified) (1 diff)
• fullscreen/UIMachineViewFullscreen.cpp (modified) (4 diffs)
• seamless/UIMachineViewSeamless.cpp (modified) (3 diffs)

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

@@ -291 +291 @@
     void setMarkAsUnused(bool fUnused);
 
-    /** Returns whether frame-buffer is <b>auto-enabled</b>.
-      * @note Refer to m_fAutoEnabled for more information. */
-    bool isAutoEnabled() const { return m_fAutoEnabled; }
-    /** Defines whether frame-buffer is <b>auto-enabled</b>.
-      * @note Refer to m_fAutoEnabled for more information. */
-    void setAutoEnabled(bool fAutoEnabled) { m_fAutoEnabled = fAutoEnabled; }
-
     /** Returns the frame-buffer's scaled-size. */
     QSize scaledSize() const { return m_scaledSize; }
@@ -512 +505 @@
       * <b>Unused</b> status determines whether frame-buffer should ignore EMT events or not. */
     bool m_fUnused;
-
-    /** Defines whether frame-buffer is <b>auto-enabled</b>.
-      * <b>Auto-enabled</b> status means that guest-screen corresponding to this frame-buffer
-      * was automatically enabled by the multi-screen layout (auto-mount guest-screen) functionality,
-      * so have potentially incorrect size-hint posted into guest event queue.
-      * Machine-view will try to automatically adjust guest-screen size as soon as possible. */
-    bool m_fAutoEnabled;
 
     /** RTCRITSECT object to protect frame-buffer access. */
@@ -1102 +1088 @@
     , m_fUpdatesAllowed(false)
     , m_fUnused(false)
-    , m_fAutoEnabled(false)
     , m_dScaleFactor(1.0)
     , m_enmScalingOptimizationType(ScalingOptimizationType_None)
@@ -2414 +2399 @@
 }
 
-bool UIFrameBuffer::isAutoEnabled() const
-{
-    return m_pFrameBuffer->isAutoEnabled();
-}
-
-void UIFrameBuffer::setAutoEnabled(bool fAutoEnabled)
-{
-    m_pFrameBuffer->setAutoEnabled(fAutoEnabled);
-}
-
 QSize UIFrameBuffer::scaledSize() const
 {

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

@@ -91 +91 @@
     void setMarkAsUnused(bool fUnused);
 
-    /** Returns whether frame-buffer is <b>auto-enabled</b>.
-      * @note Refer to m_fAutoEnabled for more information. */
-    bool isAutoEnabled() const;
-    /** Defines whether frame-buffer is <b>auto-enabled</b>.
-      * @note Refer to m_fAutoEnabled for more information. */
-    void setAutoEnabled(bool fAutoEnabled);
-
     /** Returns the frame-buffer's scaled-size. */
     QSize scaledSize() const;

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

@@ -168 +168 @@
                 if (pFrameBuffer->height() > 0)
                     uHeight = pFrameBuffer->height();
-                pFrameBuffer->setAutoEnabled(true);
             }
             /* Re-enable guest-screen with proper resolution: */

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

@@ -138 +138 @@
     bool fAdjust = false;
 
-    /* Step 1: Was the guest-screen enabled automatically? */
-    if (!fAdjust)
-    {
-        if (frameBuffer()->isAutoEnabled())
-        {
-            LogRel2(("GUI: UIMachineViewFullscreen::adjustGuestScreenSize: Guest-screen was enabled automatically, adjustment is required.\n"));
-            fAdjust = true;
-        }
-    }
-    /* Step 2: Is the guest-screen of another size than necessary? */
+    /* Step 1: Is the guest-screen of another size than necessary? */
     if (!fAdjust)
     {
@@ -165 +156 @@
     }
 
-    /* Step 3: Is guest-screen visible? */
+    /* Step 2: Is guest-screen visible? */
     if (fAdjust)
     {
@@ -174 +165 @@
         }
     }
-    /* Step 4: Is guest-screen auto-resize enabled? */
+    /* Step 3: Is guest-screen auto-resize enabled? */
     if (fAdjust)
     {
@@ -187 +178 @@
     if (fAdjust)
     {
-        frameBuffer()->setAutoEnabled(false);
         sltPerformGuestResize(calculateMaxGuestSize());
         /* And remember the size to know what we are resizing out of when we exit: */

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

@@ -151 +151 @@
     bool fAdjust = false;
 
-    /* Step 1: Was the guest-screen enabled automatically? */
-    if (!fAdjust)
-    {
-        if (frameBuffer()->isAutoEnabled())
-        {
-            LogRel2(("GUI: UIMachineViewSeamless::adjustGuestScreenSize: Guest-screen was enabled automatically, adjustment is required.\n"));
-            fAdjust = true;
-        }
-    }
-    /* Step 2: Is the guest-screen of another size than necessary? */
+    /* Step 1: Is the guest-screen of another size than necessary? */
     if (!fAdjust)
     {
@@ -178 +169 @@
     }
 
-    /* Step 3: Is guest-screen visible? */
+    /* Step 2: Is guest-screen visible? */
     if (fAdjust)
     {
@@ -191 +182 @@
     if (fAdjust)
     {
-        frameBuffer()->setAutoEnabled(false);
         sltPerformGuestResize(calculateMaxGuestSize());
         /* And remember the size to know what we are resizing out of when we exit: */