Changeset 32407 in vbox

Timestamp:

Sep 10, 2010 1:39:19 PM (14 years ago)

Author:

vboxsync

Message:

FE/Qt4: show full VM output on save state restore

Location:

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

Files:

• UIMachineView.cpp (modified) (6 diffs)
• scale/UIMachineViewScale.cpp (modified) (7 diffs)

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

@@ -162 +162 @@
             break;
         }
-#ifdef VBOX_TEST_IMAGE_ON_RESTORE
         case KMachineState_Restoring:
         {
@@ -174 +173 @@
             break;
         }
-#endif
         case KMachineState_Running:
         {
@@ -384 +382 @@
     }
 
-#ifdef VBOX_TEST_IMAGE_ON_RESTORE
     QSize size;
 #ifdef Q_WS_X11
@@ -399 +396 @@
     machine.QuerySavedScreenshotPNGSize(0, buffer, width, height);
     if (buffer > 0)
-        size = guestSizeHint();
+    {
+        /* Init with the screenshot size */
+        size = QSize(width, height);
+        /* Try to get the real guest dimensions from the save state */
+        ULONG guestWidth = 0, guestHeight = 0;
+        machine.QuerySavedGuestSize(0, guestWidth, guestHeight);
+        if (   guestWidth  > 0
+            && guestHeight > 0)
+            size = QSize(guestWidth, guestHeight);
+    }
     /* If we have a valid size, resize the framebuffer. */
     if (   size.width() > 0
@@ -407 +413 @@
         frameBuffer()->resizeEvent(&event);
     }
-#else
-#ifdef Q_WS_X11
-    /* Processing pseudo resize-event to synchronize frame-buffer
-     * with stored framebuffer size in case of machine state was 'saved': */
-    if (session().GetMachine().GetState() == KMachineState_Saved)
-    {
-        QSize size = guestSizeHint();
-        UIResizeEvent event(FramebufferPixelFormat_Opaque, NULL, 0, 0, size.width(), size.height());
-        frameBuffer()->resizeEvent(&event);
-    }
-#endif /* Q_WS_X11 */
-#endif
 }
 
@@ -684 +678 @@
     if (screenData.size() != 0)
     {
-        QImage shot = QImage::fromData(screenData.data(), screenData.size(), "PNG").scaled(guestSizeHint());
+        ULONG guestWidth = 0, guestHeight = 0;
+        machine.QuerySavedGuestSize(0, guestWidth, guestHeight);
+        QImage shot = QImage::fromData(screenData.data(), screenData.size(), "PNG").scaled(guestWidth > 0 ? QSize(guestWidth, guestHeight) : guestSizeHint());
         dimImage(shot);
         m_pauseShot = QPixmap::fromImage(shot);

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

@@ -102 +102 @@
     if (screenData.size() != 0)
     {
-        QImage shot = QImage::fromData(screenData.data(), screenData.size(), "PNG").scaled(guestSizeHint());
+        ULONG guestWidth = 0, guestHeight = 0;
+        machine.QuerySavedGuestSize(0, guestWidth, guestHeight);
+        QImage shot = QImage::fromData(screenData.data(), screenData.size(), "PNG").scaled(guestWidth > 0 ? QSize(guestWidth, guestHeight) : guestSizeHint());
         m_pPauseImage = new QImage(shot);
         scalePauseShot();
@@ -127 +129 @@
         if (scaledSize.isValid())
         {
-            QImage tmpImg = m_pPauseImage->scaled(frameBuffer()->scaledSize(), Qt::IgnoreAspectRatio, Qt::SmoothTransformation);
+            QImage tmpImg = m_pPauseImage->scaled(scaledSize, Qt::IgnoreAspectRatio, Qt::SmoothTransformation);
             dimImage(tmpImg);
             m_pauseShot = QPixmap::fromImage(tmpImg);
@@ -238 +240 @@
                                qobject_cast<QMainWindow*>(machineWindowWrapper()->machineWindow()) : 0;
 
-    if (pWatched != 0 && pWatched == pMainDialog)
+    if (pWatched != 0 && pWatched == viewport())
     {
         switch (pEvent->type())
@@ -248 +250 @@
                 break;
             }
+            default:
+                break;
+        }
+    }
+    else if (pWatched != 0 && pWatched == pMainDialog)
+    {
+        switch (pEvent->type())
+        {
 #if defined (Q_WS_WIN32)
 # if defined (VBOX_GUI_USE_DDRAW)
@@ -307 +317 @@
     }
 
-#ifdef VBOX_TEST_IMAGE_ON_RESTORE
     QSize size;
 #ifdef Q_WS_X11
@@ -322 +331 @@
     machine.QuerySavedScreenshotPNGSize(0, buffer, width, height);
     if (buffer > 0)
-        size = guestSizeHint();
+    {
+        /* Init with the screenshot size */
+        size = QSize(width, height);
+        /* Try to get the real guest dimensions from the save state */
+        ULONG guestWidth = 0, guestHeight = 0;
+        machine.QuerySavedGuestSize(0, guestWidth, guestHeight);
+        if (   guestWidth  > 0
+            && guestHeight > 0)
+            size = QSize(guestWidth, guestHeight);
+    }
     /* If we have a valid size, resize the framebuffer. */
     if (   size.width() > 0
@@ -329 +347 @@
         UIResizeEvent event(FramebufferPixelFormat_Opaque, NULL, 0, 0, size.width(), size.height());
         frameBuffer()->resizeEvent(&event);
-        QTimer::singleShot(0, this, SLOT(sltPerformGuestScale()));
-    }
-#endif
+    }
 }