Changeset 51510 in vbox for trunk/src/VBox

Timestamp:

Jun 3, 2014 12:21:11 PM (11 years ago)

Author:

vboxsync

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

94126

Message:

FE/Qt: Runtime UI: Some cleanup for machine-view: Removing old legacy from SDL frame-buffer.

File:

• trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineView.cpp (modified) (3 diffs)

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

@@ -86 +86 @@
 # include <Carbon/Carbon.h>
 #endif /* Q_WS_MAC */
-
-class UIViewport: public QWidget
-{
-public:
-
-    UIViewport(QWidget *pParent = 0) : QWidget(pParent)
-    {
-        /* No need for background drawing: */
-        setAttribute(Qt::WA_OpaquePaintEvent);
-        /* Enable multi-touch support: */
-        setAttribute(Qt::WA_AcceptTouchEvents);
-    }
-
-    QPaintEngine *paintEngine() const
-    {
-        if (testAttribute(Qt::WA_PaintOnScreen))
-            return NULL;
-        else
-            return QWidget::paintEngine();
-    }
-};
 
 UIMachineView* UIMachineView::create(  UIMachineWindow *pMachineWindow
@@ -386 +365 @@
 {
     /* Prepare viewport: */
-    setViewport(new UIViewport);
+    AssertPtrReturnVoid(viewport());
+    {
+        /* Enable manual painting: */
+        viewport()->setAttribute(Qt::WA_OpaquePaintEvent);
+        /* Enable multi-touch support: */
+        viewport()->setAttribute(Qt::WA_AcceptTouchEvents);
+    }
 }
 
@@ -982 +967 @@
         /* We have a snapshot for the paused state: */
         QRect rect = pPaintEvent->rect().intersect(viewport()->rect());
-        /* We have to disable paint on screen if we are using the regular painter: */
-        bool fPaintOnScreen = viewport()->testAttribute(Qt::WA_PaintOnScreen);
-        viewport()->setAttribute(Qt::WA_PaintOnScreen, false);
         QPainter painter(viewport());
         painter.drawPixmap(rect, m_pauseShot, QRect(rect.x() + contentsX(), rect.y() + contentsY(),
                                                     rect.width(), rect.height()));
-        /* Restore the attribute to it's previous state: */
-        viewport()->setAttribute(Qt::WA_PaintOnScreen, fPaintOnScreen);
 #ifdef Q_WS_MAC
         /* Update the dock icon: */