correct painting on QtAV::QOpenGLWidget

painter.beigin(pd->redirected(&offset))
wljcom · Jan 12, 2015 · 896475d · 896475d
1 parent 8f2514a
commit 896475d
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 3 deletions.
diff --git a/widgets/QOpenGLWidget.cpp b/widgets/QOpenGLWidget.cpp
@@ -24,6 +24,23 @@
 
 namespace QtAV {
 
+// TODO: is QOpenGLWidgetPaintDevice required?
+class QOpenGLWidgetPaintDevice : public QOpenGLPaintDevice
+{
+public:
+    QOpenGLWidgetPaintDevice(QOpenGLWidget *widget)
+            : QOpenGLPaintDevice()
+            , w(widget)
+    { }
+    void ensureActiveTarget() Q_DECL_OVERRIDE {
+        if (QOpenGLContext::currentContext() != w->context()) {
+            w->makeCurrent();
+        }
+    }
+private:
+    QOpenGLWidget *w;
+};
+
 QOpenGLWidget::QOpenGLWidget(QWidget *parent, Qt::WindowFlags f)
     : QWidget(parent, f)
     , m_initialized(false)
@@ -85,6 +102,13 @@ QOpenGLContext *QOpenGLWidget::context() const
     return m_context;
 }
 
+QPaintDevice* QOpenGLWidget::redirected(QPoint *offset) const
+{
+    Q_UNUSED(offset);
+    // TODO: check backing store like Qt does
+    return m_paintDevice;
+}
+
 void QOpenGLWidget::initializeGL()
 {
 }
@@ -149,7 +173,7 @@ void QOpenGLWidget::initialize()
         qWarning("QOpenGLWidget: Failed to make context current");
         return;
     }
-    m_paintDevice = new QOpenGLPaintDevice();
+    m_paintDevice = new QOpenGLWidgetPaintDevice(this);
     m_paintDevice->setSize(size() * devicePixelRatio());
     m_paintDevice->setDevicePixelRatio(devicePixelRatio());
     m_initialized = true;
@@ -161,11 +185,12 @@ void QOpenGLWidget::render()
     if (m_fakeHidden || !m_initialized)
         return;
     // QOpenGLContext::swapBuffers() called with non-exposed window, behavior is undefined
-    if (!windowHandle() || !windowHandle()->isExposed())
+    QWindow *win = windowHandle();
+    if (!win || !win->isExposed())
         return;
     makeCurrent();
     invokeUserPaint();
-    m_context->swapBuffers(windowHandle());
+    m_context->swapBuffers(win);
 }
 
 void QOpenGLWidget::invokeUserPaint()

diff --git a/widgets/QtAVWidgets/QOpenGLWidget.h b/widgets/QtAVWidgets/QOpenGLWidget.h
@@ -51,6 +51,7 @@ class Q_AVWIDGETS_EXPORT QOpenGLWidget : public QWidget
     void doneCurrent();
     QOpenGLContext *context() const;
 protected:
+    QPaintDevice* redirected(QPoint *offset) const Q_DECL_OVERRIDE;
     virtual void initializeGL();
     virtual void resizeGL(int w, int h);
     virtual void paintGL();