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

Timestamp:

May 7, 2010 2:58:50 PM (15 years ago)

Author:

vboxsync

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

61299

Message:

FE/Qt4-2D/3D: fix mode switching when both 2D and 3D is enabled

Location:

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

Files:

• UIFrameBuffer.cpp (modified) (1 diff)
• UIFrameBuffer.h (modified) (1 diff)
• UIMachineView.cpp (modified) (1 diff)
• UISession.cpp (modified) (1 diff)

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

@@ -244 +244 @@
     AssertBreakpoint();
 }
+
+void UIFrameBuffer::setView(UIMachineView * pView)
+{
+    m_pMachineView = pView;
+    m_uWinId = (m_pMachineView && m_pMachineView->viewport()) ? (ULONG64)m_pMachineView->viewport()->winId() : 0;
+}
 #endif
 

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

@@ -226 +226 @@
     virtual void viewportScrolled(int /* iX */, int /* iY */) {}
 
-    virtual void setView(UIMachineView * pView) { m_pMachineView = pView; }
+    virtual void setView(UIMachineView * pView);
 #endif
 

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

@@ -614 +614 @@
         }
 
-#ifdef VBOX_WITH_VIDEOHWACCEL
         /* always perform SetFramebuffer to ensure 3D gets notified */
-#endif
         display.SetFramebuffer(m_uScreenId, CFramebuffer(m_pFrameBuffer));
     }

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

@@ -1536 +1536 @@
 {
     Assert(screenId < (ulong)m_FrameBufferVector.size());
-    if (screenId < (ulong)m_FrameBufferVector.size())
-        return m_FrameBufferVector.at((int)screenId);
-    return NULL;
+    return m_FrameBufferVector.value((int)screenId, NULL);
 }