Changeset 39110 in vbox for trunk/src/VBox/Frontends

Timestamp:

Oct 25, 2011 2:03:49 PM (13 years ago)

Author:

vboxsync

Message:

FE/Qt: fix issues which appeared with scale view mode after we stopped re-creating the frame-buffer on view switches.

Location:

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

Files:

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

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

@@ -272 +272 @@
 {
     /* Prepare frame-buffer depending on render-mode: */
-    switch (vboxGlobal().vmRenderMode())
+    switch (getRenderMode())
     {
 #ifdef VBOX_GUI_USE_QIMAGE
@@ -923 +923 @@
 }
 
+VBoxDefs::RenderMode UIMachineView::getRenderMode() const
+{
+    if (visualStateType() != UIVisualStateType_Scale)
+        return vboxGlobal().vmRenderMode();
+    /* This part of the method is temporary since not all of our framebuffer
+     * modes currently support scale view mode.  Once they do it will be
+     * removed. */
+    /** @note this could have been a mini-class which would be easier to
+     * unit test. */
+    /* Prepare frame-buffer depending on render-mode: */
+    switch (vboxGlobal().vmRenderMode())
+    {
+#ifdef VBOX_GUI_USE_QUARTZ2D
+        case VBoxDefs::Quartz2DMode:
+            return VBoxDefs::Quartz2DMode;
+#endif /* VBOX_GUI_USE_QUARTZ2D */
+        default:
+#ifdef VBOX_GUI_USE_QIMAGE
+        case VBoxDefs::QImageMode:
+            return VBoxDefs::QImageMode;
+#endif /* VBOX_GUI_USE_QIMAGE */
+        break;
+    }
+    AssertReleaseMsgFailed(("Scale-mode currently does NOT supporting render-mode %d\n", vboxGlobal().vmRenderMode()));
+    qApp->exit(1);
+}
+
 bool UIMachineView::event(QEvent *pEvent)
 {

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

@@ -181 +181 @@
      * virtual monitor.  Used for storing monitor-specific extra data. */
     QString makeExtraDataKeyPerMonitor(QString base) const;
+    /** Returns the current rendering mode.
+     * @note contains special case logic for scale mode. */
+    VBoxDefs::RenderMode getRenderMode() const;
 
     /* Cross-platforms event processors: */

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

@@ -76 +76 @@
     saveMachineViewSettings();
 
+    /* Disable scaling: */
+    frameBuffer()->setScaledSize(QSize());
+
     /* Cleanup frame buffer: */
     cleanupFrameBuffer();
@@ -259 +262 @@
 }
 
-void UIMachineViewScale::prepareFrameBuffer()
-{
-    /* That method is partial copy-paste of UIMachineView::prepareFrameBuffer()
-     * and its temporary here just because not all of our frame-buffers are currently supports scale-mode;
-     * When all of our frame-buffers will be supporting scale-mode, method will be removed!
-     * Here we are processing only these frame-buffer types, which knows scale-mode! */
-
-    /* Prepare frame-buffer depending on render-mode: */
-    switch (vboxGlobal().vmRenderMode())
-    {
-#ifdef VBOX_GUI_USE_QUARTZ2D
-        case VBoxDefs::Quartz2DMode:
-            /* Indicate that we are doing all drawing stuff ourself: */
-            viewport()->setAttribute(Qt::WA_PaintOnScreen);
-            m_pFrameBuffer = new UIFrameBufferQuartz2D(this);
-            break;
-#endif /* VBOX_GUI_USE_QUARTZ2D */
-        default:
-#ifdef VBOX_GUI_USE_QIMAGE
-        case VBoxDefs::QImageMode:
-            m_pFrameBuffer = new UIFrameBufferQImage(this);
-            break;
-#endif /* VBOX_GUI_USE_QIMAGE */
-            AssertReleaseMsgFailed(("Scale-mode is currently NOT supporting that render-mode: %d\n", vboxGlobal().vmRenderMode()));
-            LogRel(("Scale-mode is currently NOT supporting that render-mode: %d\n", vboxGlobal().vmRenderMode()));
-            qApp->exit(1);
-            break;
-    }
-
-    /* If frame-buffer was prepared: */
-    if (m_pFrameBuffer)
-    {
-        /* Prepare display: */
-        CDisplay display = session().GetConsole().GetDisplay();
-        Assert(!display.isNull());
-        m_pFrameBuffer->AddRef();
-        display.SetFramebuffer(m_uScreenId, CFramebuffer(m_pFrameBuffer));
-    }
-
-    QSize size;
-#ifdef Q_WS_X11
-    /* Processing pseudo resize-event to synchronize frame-buffer with stored
-     * framebuffer size. On X11 this will be additional done when the machine
-     * state was 'saved'. */
-    if (session().GetMachine().GetState() == KMachineState_Saved)
-        size = guestSizeHint();
-#endif /* Q_WS_X11 */
-    /* If there is a preview image saved, we will resize the framebuffer to the
-     * size of that image. */
-    ULONG buffer = 0, width = 0, height = 0;
-    CMachine machine = session().GetMachine();
-    machine.QuerySavedScreenshotPNGSize(0, buffer, width, height);
-    if (buffer > 0)
-    {
-        /* 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
-        && size.height() > 0)
-    {
-        UIResizeEvent event(FramebufferPixelFormat_Opaque, NULL, 0, 0, size.width(), size.height());
-        frameBuffer()->resizeEvent(&event);
-    }
-}
-
 void UIMachineViewScale::saveMachineViewSettings()
 {

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

@@ -56 +56 @@
 
     /* Prepare helpers: */
-    void prepareFrameBuffer();
+    // void prepareFrameBuffer();
     //void loadMachineViewSettings();