Merge branch 'Plasma/5.7'
This commit is contained in:
commit
5ecec4e42c
1 changed files with 2 additions and 1 deletions
|
@ -1646,7 +1646,8 @@ void SceneOpenGL2Window::performPaint(int mask, QRegion region, WindowPaintData
|
||||||
setBlendEnabled(false);
|
setBlendEnabled(false);
|
||||||
|
|
||||||
// render sub-surfaces
|
// render sub-surfaces
|
||||||
const auto &children = windowPixmap<OpenGLWindowPixmap>()->children();
|
auto wp = windowPixmap<OpenGLWindowPixmap>();
|
||||||
|
const auto &children = wp ? wp->children() : QVector<WindowPixmap*>();
|
||||||
windowMatrix.translate(toplevel->clientPos().x(), toplevel->clientPos().y());
|
windowMatrix.translate(toplevel->clientPos().x(), toplevel->clientPos().y());
|
||||||
for (auto pixmap : children) {
|
for (auto pixmap : children) {
|
||||||
if (pixmap->subSurface().isNull() || pixmap->subSurface()->surface().isNull() || !pixmap->subSurface()->surface()->isMapped()) {
|
if (pixmap->subSurface().isNull() || pixmap->subSurface()->surface().isNull() || !pixmap->subSurface()->surface()->isMapped()) {
|
||||||
|
|
Loading…
Reference in a new issue