1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix OpenGL mode in examples like composition

Browse Source 
To avoid an incorrect offset for the native window, call create()
after createWindowContainer().

The mysterious -1 for the width and height are removed as well because
otherwise the GL window's size is clearly off by one.

Fixes: QTBUG-82195
Pick-to: 5.15
Change-Id: I1a9cec62746fc110bfc4cd2e4fa111f621124638
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
This commit is contained in:
Laszlo Agocs 2020-06-08 15:08:45 +02:00
parent bc84b7d046
commit d4548751b7
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
examples/widgets/painting/shared/arthurwidgets.cpp
View File

@ -129,9 +129,11 @@ void ArthurFrame::createGlWindow()
f.setStencilBufferSize(8); f.setStencilBufferSize(8);
m_glWindow->setFormat(f); m_glWindow->setFormat(f);
m_glWindow->setFlags(Qt::WindowTransparentForInput); m_glWindow->setFlags(Qt::WindowTransparentForInput);
m_glWindow->resize(width() - 1, height() - 1); m_glWindow->resize(width(), height());
m_glWindow->create();
m_glWidget = QWidget::createWindowContainer(m_glWindow, this); m_glWidget = QWidget::createWindowContainer(m_glWindow, this);
// create() must be called after createWindowContainer() otherwise
// an incorrect offsetting of the position will occur.
m_glWindow->create();
} }
#endif #endif
@ -235,7 +237,7 @@ void ArthurFrame::resizeEvent(QResizeEvent *e)
{ {
#if QT_CONFIG(opengl) #if QT_CONFIG(opengl)
if (m_glWidget) if (m_glWidget)
m_glWidget->setGeometry(0, 0, e->size().width()-1, e->size().height()-1); m_glWidget->setGeometry(0, 0, e->size().width(), e->size().height());
#endif #endif
QWidget::resizeEvent(e); QWidget::resizeEvent(e);
} }