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

Timestamp:

May 22, 2012 4:41:38 PM (13 years ago)

Author:

vboxsync

Message:

crOpenGL: VM window scroll handling

Location:

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

Files:

• UIMachineView.cpp (modified) (4 diffs)
• UIMachineView.h (modified) (1 diff)

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

@@ -791 +791 @@
 }
 
+void UIMachineView::scrollContentsBy(int dx, int dy)
+{
 #ifdef VBOX_WITH_VIDEOHWACCEL
-void UIMachineView::scrollContentsBy(int dx, int dy)
-{
     if (m_pFrameBuffer)
     {
         m_pFrameBuffer->viewportScrolled(dx, dy);
     }
+#endif /* VBOX_WITH_VIDEOHWACCEL */
     QAbstractScrollArea::scrollContentsBy(dx, dy);
-}
-#endif /* VBOX_WITH_VIDEOHWACCEL */
+
+    session().GetConsole().GetDisplay().ViewportChanged(screenId(),
+                            contentsX(),
+                            contentsY(),
+                            contentsWidth(),
+                            contentsHeight());
+}
+
 
 #ifdef Q_WS_MAC
@@ -1003 +1010 @@
 bool UIMachineView::eventFilter(QObject *pWatched, QEvent *pEvent)
 {
-#ifdef VBOX_WITH_VIDEOHWACCEL
     if (pWatched == viewport())
     {
@@ -1010 +1016 @@
             case QEvent::Resize:
             {
+                QResizeEvent* pResizeEvent = static_cast<QResizeEvent*>(pEvent);
+#ifdef VBOX_WITH_VIDEOHWACCEL
                 if (m_pFrameBuffer)
-                    m_pFrameBuffer->viewportResized(static_cast<QResizeEvent*>(pEvent));
+                    m_pFrameBuffer->viewportResized(pResizeEvent);
+#endif /* VBOX_WITH_VIDEOHWACCEL */
+                session().GetConsole().GetDisplay().ViewportChanged(screenId(),
+                        contentsX(),
+                        contentsY(),
+                        contentsWidth(),
+                        contentsHeight());
                 break;
             }
@@ -1018 +1032 @@
         }
     }
-#endif /* VBOX_WITH_VIDEOHWACCEL */
     if (pWatched == machineWindow())
     {

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

@@ -165 +165 @@
     void scrollBy(int dx, int dy);
     static void dimImage(QImage &img);
-#ifdef VBOX_WITH_VIDEOHWACCEL
     void scrollContentsBy(int dx, int dy);
-#endif /* VBOX_WITH_VIDEOHWACCEL */
 #ifdef Q_WS_MAC
     void updateDockIcon();