Changeset 86051 in vbox for trunk/src

Timestamp:

Sep 7, 2020 4:17:11 PM (4 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9760: Runtime UI: A bit of fixes for geometry restoring procedure taking into account changes done in r140259.

Location:

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

Files:

• UIMachineWindow.cpp (modified) (2 diffs)
• UIMachineWindow.h (modified) (3 diffs)
• normal/UIMachineWindowNormal.cpp (modified) (3 diffs)

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

@@ -223 +223 @@
 }
 
+bool UIMachineWindow::shouldResizeToGuestDisplay() const
+{
+    return    actionPool()
+           && actionPool()->action(UIActionIndexRT_M_View_T_GuestAutoresize)
+           && actionPool()->action(UIActionIndexRT_M_View_T_GuestAutoresize)->isChecked();
+}
+
 void UIMachineWindow::adjustMachineViewSize()
 {
@@ -233 +240 @@
     /* 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

@@ -87 +87 @@
     const QString& machineName() const;
 
+    /** Returns whether the machine-window should resize to fit to the guest display.
+      * @note Relevant only to normal (windowed) case. */
+    bool shouldResizeToGuestDisplay() const;
+
     /** Restores cached window geometry.
       * @note Reimplemented in sub-classes. Base implementation does nothing. */
@@ -95 +99 @@
       * @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, bool fResizeToGuestDisplay) { Q_UNUSED(fAdjustPosition); Q_UNUSED(fResizeToGuestDisplay);}
+    virtual void normalizeGeometry(bool fAdjustPosition, bool fResizeToGuestDisplay) { Q_UNUSED(fAdjustPosition); Q_UNUSED(fResizeToGuestDisplay); }
 
     /** Adjusts machine-view size to correspond current machine-window size. */
@@ -102 +106 @@
     /** 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

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

@@ -156 +156 @@
     /* Normalize geometry without moving: */
     normalizeGeometry(false /* adjust position */, shouldResizeToGuestDisplay());
-
 }
 
@@ -377 +376 @@
         if (!geo.isNull())
         {
-            /* If previous machine-state was SAVED: */
-            if (machine().GetState() == KMachineState_Saved)
-            {
-                /* Restore window geometry: */
-                m_normalGeometry = geo;
-                UICommon::setTopLevelGeometry(this, m_normalGeometry);
-            }
-            /* If previous machine-state was NOT SAVED: */
-            else
-            {
-                m_normalGeometry = geo;
-                UICommon::setTopLevelGeometry(this, m_normalGeometry);
-                /* And normalize to the optimal-size: */
+            /* Restore window geometry: */
+            m_normalGeometry = geo;
+            UICommon::setTopLevelGeometry(this, m_normalGeometry);
+
+            /* If previous machine-state was NOT SAVED => normalize window to the optimal-size: */
+            if (machine().GetState() != KMachineState_Saved)
                 normalizeGeometry(false /* adjust position */, shouldResizeToGuestDisplay());
-            }
-
-            /* Maximize (if necessary): */
+
+            /* Maximize window (if necessary): */
             if (gEDataManager->machineWindowShouldBeMaximized(machineLogic()->visualStateType(),
                                                               m_uScreenId, uiCommon().managedVMUuid()))
@@ -401 +392 @@
         else
         {
-            /* Get available geometry, for screen with (x,y) coords if possible: */
-            QRect availableGeo = !geo.isNull() ? gpDesktop->availableGeometry(QPoint(geo.x(), geo.y())) :
-                                                 gpDesktop->availableGeometry(this);
-
-            /* Normalize to the optimal size: */
+            /* Normalize window to the optimal size: */
             normalizeGeometry(true /* adjust position */, shouldResizeToGuestDisplay());
-            /* Move newly created window to the screen-center: */
+
+            /* Move it to the screen-center: */
             m_normalGeometry = geometry();
-            m_normalGeometry.moveCenter(availableGeo.center());
+            m_normalGeometry.moveCenter(gpDesktop->availableGeometry(this).center());
             UICommon::setTopLevelGeometry(this, m_normalGeometry);
         }