Changeset 67031 in vbox for trunk

Timestamp:

May 23, 2017 9:55:30 AM (8 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:8867: FE/Qt: user report: VM window size not being restored for jessie VMs
Try suppressing size hints sent from the window to the virtual machine if they match the current virtual screen size.

File:

• trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineView.cpp (modified) (2 diffs)

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

@@ -312 +312 @@
     /* Send new size-hint to the guest: */
     LogRel(("GUI: UIMachineView::sltPerformGuestResize: "
-            "Sending guest size-hint to screen %d as %dx%d\n",
+            "Sending guest size-hint to screen %d as %dx%d if necessary\n",
             (int)screenId(), size.width(), size.height()));
 
@@ -318 +318 @@
     if (gEDataManager->autoMountGuestScreensEnabled(vboxGlobal().managedVMUuid()))
     {
-        /* If host and guest have same opinion about guest-screen visibility: */
-        if (uisession()->isScreenVisible(screenId()) == uisession()->isScreenVisibleHostDesires(screenId()))
+        /* Do not send a hint if nothing has changed to prevent the guest being notified about its own changes: */
+        if (   (int)m_pFrameBuffer->width() != size.width() || (int)m_pFrameBuffer->height() != size.height()
+            || uisession()->isScreenVisible(screenId()) != uisession()->isScreenVisibleHostDesires(screenId()))
+        {
+            /* If host and guest have same opinion about guest-screen visibility: */
+            if (uisession()->isScreenVisible(screenId()) == uisession()->isScreenVisibleHostDesires(screenId()))
+                display().SetVideoModeHint(screenId(),
+                                           uisession()->isScreenVisible(screenId()),
+                                           false, 0, 0, size.width(), size.height(), 0);
+            /* If host desires to have guest-screen disabled and guest-screen is enabled, retrying: */
+            else if (!uisession()->isScreenVisibleHostDesires(screenId()))
+                display().SetVideoModeHint(screenId(), false, false, 0, 0, 0, 0, 0);
+            /* If host desires to have guest-screen enabled and guest-screen is disabled, retrying: */
+            else if (uisession()->isScreenVisibleHostDesires(screenId()))
+                display().SetVideoModeHint(screenId(), true, false, 0, 0, size.width(), size.height(), 0);
+        }
+    }
+    /* If auto-mount of guest-screens (auto-pilot) disabled: */
+    else
+    {
+        /* Do not send a hint if nothing has changed to prevent the guest being notified about its own changes: */
+        if ((int)m_pFrameBuffer->width() != size.width() || (int)m_pFrameBuffer->height() != size.height())
             display().SetVideoModeHint(screenId(),
                                        uisession()->isScreenVisible(screenId()),
                                        false, 0, 0, size.width(), size.height(), 0);
-        /* If host desires to have guest-screen disabled and guest-screen is enabled, retrying: */
-        else if (!uisession()->isScreenVisibleHostDesires(screenId()))
-            display().SetVideoModeHint(screenId(), false, false, 0, 0, 0, 0, 0);
-        /* If host desires to have guest-screen enabled and guest-screen is disabled, retrying: */
-        else if (uisession()->isScreenVisibleHostDesires(screenId()))
-            display().SetVideoModeHint(screenId(), true, false, 0, 0, size.width(), size.height(), 0);
-    }
-    /* If auto-mount of guest-screens (auto-pilot) disabled: */
-    else
-    {
-        display().SetVideoModeHint(screenId(),
-                                   uisession()->isScreenVisible(screenId()),
-                                   false, 0, 0, size.width(), size.height(), 0);
     }
 }