Changeset 86046 in vbox for trunk/src

Timestamp:

Sep 7, 2020 3:27:58 PM (4 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9760. Decoupling auto resize action from GA existence and restoring the window size after a cold boot

Location:

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

Files:

• UIMachineLogic.cpp (modified) (2 diffs)
• UIMachineView.cpp (modified) (2 diffs)
• UIMachineWindow.cpp (modified) (2 diffs)
• UIMachineWindow.h (modified) (3 diffs)
• normal/UIMachineWindowNormal.cpp (modified) (9 diffs)
• normal/UIMachineWindowNormal.h (modified) (1 diff)

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

@@ -683 +683 @@
     /* Update action states: */
     LogRel3(("GUI: UIMachineLogic::sltAdditionsStateChanged: Adjusting actions availability according to GA state.\n"));
-    actionPool()->action(UIActionIndexRT_M_View_T_GuestAutoresize)->setEnabled(uisession()->isGuestSupportsGraphics());
     actionPool()->action(UIActionIndexRT_M_View_T_Seamless)->setEnabled(uisession()->isVisualStateAllowed(UIVisualStateType_Seamless) &&
                                                                         uisession()->isGuestSupportsSeamless());
@@ -1979 +1978 @@
 
         /* Normalize window geometry: */
-        pMachineWindow->normalizeGeometry(true /* adjust position */);
+        pMachineWindow->normalizeGeometry(true /* adjust position */, true /* resize window to guest display size */);
     }
 }

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

@@ -375 +375 @@
         if (visualStateType() == UIVisualStateType_Normal &&
             frameBufferSizeNew != frameBufferSizeOld)
-            machineWindow()->normalizeGeometry(true /* adjust position */);
+            machineWindow()->normalizeGeometry(true /* adjust position */, machineWindow()->shouldResizeToGuestDisplay());
     }
 
@@ -1074 +1074 @@
             /* Normalize 'normal' machine-window geometry: */
             if (visualStateType() == UIVisualStateType_Normal)
-                machineWindow()->normalizeGeometry(true /* adjust position */);
+                machineWindow()->normalizeGeometry(true /* adjust position */, machineWindow()->shouldResizeToGuestDisplay());
         }
 

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

@@ -24 +24 @@
 
 /* GUI includes: */
+#include "UIActionPoolRuntime.h"
 #include "UICommon.h"
 #include "UIConverter.h"
@@ -232 +233 @@
     /* Send machine-view size-hint to the guest: */
     machineView()->resendSizeHint();
+}
+
+bool UIMachineWindow::shouldResizeToGuestDisplay() const
+{
+    return actionPool() &&
+           actionPool()->action(UIActionIndexRT_M_View_T_GuestAutoresize) &&
+           actionPool()->action(UIActionIndexRT_M_View_T_GuestAutoresize)->isChecked();
 }
 

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

@@ -93 +93 @@
     /** Adjusts machine-window size to correspond current machine-view size.
       * @param fAdjustPosition determines whether is it necessary to adjust position too.
+      * @param fResizeToGuestDisplay determines if is it necessary to resize the window to fit to guest display size.
       * @note  Reimplemented in sub-classes. Base implementation does nothing. */
-    virtual void normalizeGeometry(bool fAdjustPosition) { Q_UNUSED(fAdjustPosition); }
+    virtual void normalizeGeometry(bool fAdjustPosition, bool fResizeToGuestDisplay) { Q_UNUSED(fAdjustPosition); Q_UNUSED(fResizeToGuestDisplay);}
 
     /** Adjusts machine-view size to correspond current machine-window size. */
@@ -101 +102 @@
     /** Sends machine-view size-hint to the guest. */
     virtual void sendMachineViewSizeHint();
+
+    /** Returns true if the machine window should resize to fit to the guest display. Relevant only in normal (windowed) case. */
+    bool shouldResizeToGuestDisplay() const;
 
 #ifdef VBOX_WITH_MASKED_SEAMLESS
@@ -111 +115 @@
 #ifdef VBOX_WS_X11
     /** X11: Performs machine-window geometry normalization. */
-    void sltNormalizeGeometry() { normalizeGeometry(true /* adjust position */); }
+    void sltNormalizeGeometry() { normalizeGeometry(true /* adjust position */, shouldResizeToGuestDisplay()); }
 #endif /* VBOX_WS_X11 */
 

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

@@ -155 +155 @@
 
     /* Normalize geometry without moving: */
-    normalizeGeometry(false /* adjust position */);
+    normalizeGeometry(false /* adjust position */, shouldResizeToGuestDisplay());
+
 }
 
@@ -189 +190 @@
 
     /* Normalize geometry without moving: */
-    normalizeGeometry(false /* adjust position */);
+    normalizeGeometry(false /* adjust position */, shouldResizeToGuestDisplay());
 }
 
@@ -386 +387 @@
             else
             {
-                /* Restore only window position: */
-                m_normalGeometry = QRect(geo.x(), geo.y(), width(), height());
+                m_normalGeometry = geo;
                 UICommon::setTopLevelGeometry(this, m_normalGeometry);
                 /* And normalize to the optimal-size: */
-                normalizeGeometry(false /* adjust position */);
+                normalizeGeometry(false /* adjust position */, shouldResizeToGuestDisplay());
             }
 
@@ -406 +406 @@
 
             /* Normalize to the optimal size: */
-            normalizeGeometry(true /* adjust position */);
+            normalizeGeometry(true /* adjust position */, shouldResizeToGuestDisplay());
             /* Move newly created window to the screen-center: */
             m_normalGeometry = geometry();
@@ -417 +417 @@
         QTimer::singleShot(0, this, SLOT(sltNormalizeGeometry()));
 #else /* !VBOX_WS_X11 */
-        normalizeGeometry(true /* adjust position */);
+        normalizeGeometry(true /* adjust position */, shouldResizeToGuestDisplay());
 #endif /* !VBOX_WS_X11 */
     }
@@ -427 +427 @@
     /* Save window geometry: */
     {
+        printf("UIMachineWindowNormal::saveSettings %d %d %d %d\n", m_normalGeometry.x(), m_normalGeometry.y(),
+        m_normalGeometry.width(), m_normalGeometry.height());
         gEDataManager->setMachineWindowGeometry(machineLogic()->visualStateType(),
                                                 m_uScreenId, m_normalGeometry,
@@ -535 +537 @@
 
     /* Normalize machine-window geometry: */
-    normalizeGeometry(true /* adjust position */);
+    normalizeGeometry(true /* adjust position */, shouldResizeToGuestDisplay());
 
     /* Make sure machine-view have focus: */
@@ -551 +553 @@
 }
 
-void UIMachineWindowNormal::normalizeGeometry(bool fAdjustPosition)
+void UIMachineWindowNormal::normalizeGeometry(bool fAdjustPosition, bool fResizeToGuestDisplay)
 {
 #ifndef VBOX_GUI_WITH_CUSTOMIZATIONS1
@@ -566 +568 @@
     const int db = frGeo.bottom() - geo.bottom();
 
-    /* Get the best size w/o scroll-bars: */
-    QSize sh = sizeHint();
-
-    /* If guest-screen auto-resize is not enabled
-     * or the guest-additions doesn't support graphics
-     * we should take scroll-bars size-hints into account: */
-    if (!machineView()->isGuestAutoresizeEnabled() || !uisession()->isGuestSupportsGraphics())
-    {
-        if (machineView()->verticalScrollBar()->isVisible())
-            sh -= QSize(machineView()->verticalScrollBar()->sizeHint().width(), 0);
-        if (machineView()->horizontalScrollBar()->isVisible())
-            sh -= QSize(0, machineView()->horizontalScrollBar()->sizeHint().height());
-    }
-
-    /* Resize the frame to fit the contents: */
-    sh -= size();
-    frGeo.setRight(frGeo.right() + sh.width());
-    frGeo.setBottom(frGeo.bottom() + sh.height());
+    if (fResizeToGuestDisplay)
+    {
+        /* Get the best size w/o scroll-bars: */
+        QSize sh = sizeHint();
+
+        /* If guest-screen auto-resize is not enabled
+         * or the guest-additions doesn't support graphics
+         * we should take scroll-bars size-hints into account: */
+        if (!machineView()->isGuestAutoresizeEnabled() || !uisession()->isGuestSupportsGraphics())
+        {
+            if (machineView()->verticalScrollBar()->isVisible())
+                sh -= QSize(machineView()->verticalScrollBar()->sizeHint().width(), 0);
+            if (machineView()->horizontalScrollBar()->isVisible())
+                sh -= QSize(0, machineView()->horizontalScrollBar()->sizeHint().height());
+        }
+
+        /* Resize the frame to fit the contents: */
+        sh -= size();
+        frGeo.setRight(frGeo.right() + sh.width());
+        frGeo.setBottom(frGeo.bottom() + sh.height());
+    }
 
     /* Adjust position if necessary: */

trunk/src/VBox/Frontends/VirtualBox/src/runtime/normal/UIMachineWindowNormal.h

@@ -118 +118 @@
     /** Performs window geometry normalization according to guest-size and host's available geometry.
       * @param  fAdjustPosition  Determines whether is it necessary to adjust position as well. */
-    virtual void normalizeGeometry(bool fAdjustPosition) /* override */;
+    virtual void normalizeGeometry(bool fAdjustPosition, bool fResizeToGuestDisplay) /* override */;
 
     /** Common update routine. */