AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Avoid missing paints when resizing GV with QOpenGLWidget viewport

Browse Source 
There is nothing guaranteeing there will be a paint request after
resizeViewportFramebuffer() is called. However we must not be left
with a framebuffer with uninitialized content. So trigger an update.

Include also a half-hearted autotest. QOpenGLWidget (or QGLWidget)
viewports have not been autotested at all. Try to verify that it
is functional at least, even if we cannot check the actual output.

Change-Id: I34d78fe32e94c39dad919216b5a4f4bb2aea3cc2
Task-number: QTBUG-52419
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Reviewed-by: Paul Olav Tvete <paul.tvete@theqtcompany.com>
This commit is contained in:
Laszlo Agocs 2016-05-23 13:32:59 +02:00
parent c96ddd9ee5
commit 61521b64a4
2 changed files with 48 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/widgets/kernel/qopenglwidget.cpp
View File

@ -904,8 +904,10 @@ void QOpenGLWidgetPrivate::resizeViewportFramebuffer()
if (!initialized) if (!initialized)
return; return;
if (!fbo || q->size() * q->devicePixelRatioF() != fbo->size()) if (!fbo || q->size() * q->devicePixelRatioF() != fbo->size()) {
recreateFbo(); recreateFbo();
q->update();
}
} }
/*! /*!

45
tests/auto/widgets/graphicsview/qgraphicsview/tst_qgraphicsview.cpp
View File

@ -54,6 +54,9 @@
#include <QtWidgets/QStyle> #include <QtWidgets/QStyle>
#include <QtWidgets/QPushButton> #include <QtWidgets/QPushButton>
#include <QtWidgets/QDesktopWidget> #include <QtWidgets/QDesktopWidget>
#ifndef QT_NO_OPENGL
#include <QtWidgets/QOpenGLWidget>
#endif
#include <private/qgraphicsscene_p.h> #include <private/qgraphicsscene_p.h>
#include <private/qgraphicsview_p.h> #include <private/qgraphicsview_p.h>
#include "../../../shared/platforminputcontext.h" #include "../../../shared/platforminputcontext.h"
@ -161,6 +164,9 @@ private slots:
void sceneRect_growing(); void sceneRect_growing();
void setSceneRect(); void setSceneRect();
void viewport(); void viewport();
#ifndef QT_NO_OPENGL
void openGLViewport();
#endif
void dragMode_scrollHand(); void dragMode_scrollHand();
void dragMode_rubberBand(); void dragMode_rubberBand();
void rubberBandSelectionMode(); void rubberBandSelectionMode();
@ -675,6 +681,45 @@ void tst_QGraphicsView::viewport()
QTest::qWait(25); QTest::qWait(25);
} }
#ifndef QT_NO_OPENGL
void tst_QGraphicsView::openGLViewport()
{
QGraphicsScene scene;
scene.setBackgroundBrush(Qt::white);
scene.addText("GraphicsView");
scene.addEllipse(QRectF(400, 50, 50, 50));
scene.addEllipse(QRectF(-100, -400, 50, 50));
scene.addEllipse(QRectF(50, -100, 50, 50));
scene.addEllipse(QRectF(-100, 50, 50, 50));
QGraphicsView view(&scene);
view.setSceneRect(-400, -400, 800, 800);
view.resize(400, 400);
QOpenGLWidget *glw = new QOpenGLWidget;
QSignalSpy spy1(glw, SIGNAL(resized()));
QSignalSpy spy2(glw, SIGNAL(frameSwapped()));
view.setViewport(glw);
view.show();
QTest::qWaitForWindowExposed(&view);
QTRY_VERIFY(spy1.count() > 0);
QTRY_VERIFY(spy2.count() >= spy1.count());
spy1.clear();
spy2.clear();
// Now test for resize (QTBUG-52419). This is special when the viewport is
// a QOpenGLWidget since the underlying FBO must also be maintained.
view.resize(300, 300);
QTRY_VERIFY(spy1.count() > 0);
QTRY_VERIFY(spy2.count() >= spy1.count());
// There is no sane way to check if the framebuffer contents got updated
// (grabFramebuffer is no good for the viewport case as that does not go
// through paintGL). So skip the actual verification.
}
#endif
void tst_QGraphicsView::dragMode_scrollHand() void tst_QGraphicsView::dragMode_scrollHand()
{ {
for (int j = 0; j < 2; ++j) { for (int j = 0; j < 2; ++j) {