Changeset 56443 in vbox for trunk

Timestamp:

Jun 16, 2015 10:20:52 AM (10 years ago)

Author:

vboxsync

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

101060

Message:

FE/Qt: fix sending of initial mode hints.

Location:

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

Files:

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

-              r56145
+              r56443
     foreach(UIMachineWindow *pMachineWindow, machineWindows())
         pMachineWindow->adjustMachineViewSize();
+}
+void UIMachineLogic::sendMachineWindowsSizeHints()
+{
+    /* By default, the only thing we need is to
+     * send machine-view(s) size-hint(s) to the guest: */
+    foreach(UIMachineWindow *pMachineWindow, machineWindows())
+        pMachineWindow->sendMachineViewSizeHint();
+}

-              r56098
+              r56443
     virtual void adjustMachineWindowsGeometry();
+    /** Send machine-window(s) size-hint(s) to the guest. */
+    virtual void sendMachineWindowsSizeHints();
     /* Wrapper to open Machine settings / Network page: */
     void openNetworkSettingsDialog() { sltOpenNetworkSettingsDialog(); }

-              r56321
+              r56443
     /* Public setters: */
     virtual void setGuestAutoresizeEnabled(bool /* fEnabled */) {}
+    /** Send saved guest-screen size-hint to the guest.
+      * @note Reimplemented in sub-classes. Base implementation does nothing. */
+    virtual void resendSizeHint() {}
     /** Adjusts guest-screen size to correspond current visual-style.

-              r56126
+              r56443
     /* We need to adjust guest-screen size if necessary: */
     machineView()->adjustGuestScreenSize();
+}
+void UIMachineWindow::sendMachineViewSizeHint()
+{
+    /* Send machine-view size-hint to the guest: */
+    machineView()->resendSizeHint();
+}

-              r55401
+              r56443
     /** Adjusts machine-view size to correspond current machine-window size. */
     virtual void adjustMachineViewSize();
+    /** Sends machine-view size-hint to the guest. */
+    virtual void sendMachineViewSizeHint();
 #ifdef VBOX_WITH_MASKED_SEAMLESS

-              r56133
+              r56443
+    }
     else
+    {
         msgCenter().showModalProgressDialog(progress, machineName(), ":/progress_start_90px.png");
+        /* After VM start, machine-window(s) size-hint(s) should be sent: */
+        machineLogic()->sendMachineWindowsSizeHints();
+    }
     /* Check for progress failure: */

-              r55939
+              r56443
 void UIMachineViewNormal::resendSizeHint()
+{
+    const QSize sizeHint = guestSizeHint();
+    /* Get the last size hint, taking the scale factor into account. */
+    const QSize sizeHint = scaledBackward(guestSizeHint());
     LogRel(("GUI: UIMachineViewNormal::resendSizeHint: Restoring guest size-hint for screen %d to %dx%d\n",
             (int)screenId(), sizeHint.width(), sizeHint.height()));
     /* Temporarily restrict the size to prevent a brief resize to the
      * framebuffer dimensions (see @a UIMachineView::sizeHint()) before
+     * the following resize() is acted upon. */
+     * the following resize() is acted upon.  Expand current limitations
+     * too. */
     setMaximumSize(sizeHint);
     m_sizeHintOverride = sizeHint;
     sltPerformGuestResize(sizeHint);
+    display().SetVideoModeHint(screenId(), true, false, 0, 0, sizeHint.width(), sizeHint.height(), 0);
+}

-              r55939
+              r56443
 void UIMachineViewScale::resendSizeHint()
+{
     const QSize sizeHint = guestSizeHint();
+    const QSize sizeHint = scaledBackward(guestSizeHint());
     LogRel(("GUI: UIMachineViewScale::resendSizeHint: Restoring guest size-hint for screen %d to %dx%d\n",
             (int)screenId(), sizeHint.width(), sizeHint.height()));
+    sltPerformGuestResize(sizeHint);
+    /* Expand current limitations: */
+    setMaxGuestSize(sizeHint);
+    display().SetVideoModeHint(screenId(), true, false, 0, 0, sizeHint.width(), sizeHint.height(), 0);
+}

Note: See TracChangeset for help on using the changeset viewer.