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

Timestamp:

Jun 10, 2014 4:35:18 PM (11 years ago)

Author:

vboxsync

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

94304

Message:

FE/Qt: Runtime UI: Calls to QuerySavedGuestScreenInfo should be multi-monitor aware.

Location:

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

Files:

• UIMachineView.cpp (modified) (3 diffs)
• scale/UIMachineViewScale.cpp (modified) (1 diff)

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

@@ -171 +171 @@
 void UIMachineView::sltPerformGuestResize(const QSize &toSize)
 {
-    /* Get the current machine: */
-    CMachine machine = session().GetMachine();
-
     /* If this slot is invoked directly then use the passed size otherwise get
      * the available size for the guest display. We assume here that centralWidget()
@@ -444 +441 @@
         ULONG guestOriginX = 0, guestOriginY = 0, guestWidth = 0, guestHeight = 0;
         BOOL fEnabled = true;
-        machine.QuerySavedGuestScreenInfo(0, guestOriginX, guestOriginY, guestWidth, guestHeight, fEnabled);
+        machine.QuerySavedGuestScreenInfo(m_uScreenId, guestOriginX, guestOriginY, guestWidth, guestHeight, fEnabled);
         if (   guestWidth  > 0
             && guestHeight > 0)
@@ -683 +680 @@
         ULONG guestOriginX = 0, guestOriginY = 0, guestWidth = 0, guestHeight = 0;
         BOOL fEnabled = true;
-        machine.QuerySavedGuestScreenInfo(0, guestOriginX, guestOriginY, guestWidth, guestHeight, fEnabled);
+        machine.QuerySavedGuestScreenInfo(m_uScreenId, guestOriginX, guestOriginY, guestWidth, guestHeight, fEnabled);
         QImage shot = QImage::fromData(screenData.data(), screenData.size(), "PNG").scaled(guestWidth > 0 ? QSize(guestWidth, guestHeight) : guestSizeHint());
         dimImage(shot);

trunk/src/VBox/Frontends/VirtualBox/src/runtime/scale/UIMachineViewScale.cpp

@@ -84 +84 @@
         ULONG guestOriginX = 0, guestOriginY = 0, guestWidth = 0, guestHeight = 0;
         BOOL fEnabled = true;
-        machine.QuerySavedGuestScreenInfo(0, guestOriginX, guestOriginY, guestWidth, guestHeight, fEnabled);
+        machine.QuerySavedGuestScreenInfo(m_uScreenId, guestOriginX, guestOriginY, guestWidth, guestHeight, fEnabled);
         QImage shot = QImage::fromData(screenData.data(), screenData.size(), "PNG").scaled(guestWidth > 0 ? QSize(guestWidth, guestHeight) : guestSizeHint());
         m_pPauseImage = new QImage(shot);