yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'Plasma/5.13'

Browse source
This commit is contained in:
David Edmundson 2018-06-21 01:50:23 +01:00
commit be5d0f6bac
2 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
plugins/kdecorations/aurorae/src/aurorae.cpp
View file

@ -270,8 +270,6 @@ Decoration::~Decoration()
if (m_context) { if (m_context) {
m_context->makeCurrent(m_offscreenSurface.data()); m_context->makeCurrent(m_offscreenSurface.data());
delete m_renderControl;
delete m_view.data();
m_fbo.reset(); m_fbo.reset();
delete m_item; delete m_item;
@ -324,8 +322,8 @@ void Decoration::init()
m_item->setParentItem(visualParent.value<QQuickItem*>()); m_item->setParentItem(visualParent.value<QQuickItem*>());
visualParent.value<QQuickItem*>()->setProperty("drawBackground", false); visualParent.value<QQuickItem*>()->setProperty("drawBackground", false);
} else { } else {
m_renderControl = new QQuickRenderControl(this); m_renderControl.reset(new QQuickRenderControl);
m_view = new QQuickWindow(m_renderControl); m_view = new QQuickWindow(m_renderControl.data());
bool usingGL = m_view->rendererInterface()->graphicsApi() == QSGRendererInterface::OpenGL; bool usingGL = m_view->rendererInterface()->graphicsApi() == QSGRendererInterface::OpenGL;
m_view->setColor(Qt::transparent); m_view->setColor(Qt::transparent);
m_view->setFlags(Qt::FramelessWindowHint); m_view->setFlags(Qt::FramelessWindowHint);
@ -392,8 +390,8 @@ void Decoration::init()
} }
m_updateTimer->start(); m_updateTimer->start();
}; };
connect(m_renderControl, &QQuickRenderControl::renderRequested, this, requestUpdate); connect(m_renderControl.data(), &QQuickRenderControl::renderRequested, this, requestUpdate);
connect(m_renderControl, &QQuickRenderControl::sceneChanged, this, requestUpdate); connect(m_renderControl.data(), &QQuickRenderControl::sceneChanged, this, requestUpdate);
m_item->setParentItem(m_view->contentItem()); m_item->setParentItem(m_view->contentItem());

6
plugins/kdecorations/aurorae/src/aurorae.h
View file

@ -87,7 +87,11 @@ private:
KWin::Borders *m_extendedBorders; KWin::Borders *m_extendedBorders;
KWin::Borders *m_padding; KWin::Borders *m_padding;
QString m_themeName; QString m_themeName;
QQuickRenderControl *m_renderControl = nullptr;
//workaround QtBug-68997
//deleting of a RenderControl/controlled window triggers deletion of other queued deleted items
//deleting this queued means we know we're not processing anything else at the same time and should minimise the damage
QScopedPointer<QQuickRenderControl, QScopedPointerDeleteLater> m_renderControl;
QScopedPointer<QTimer> m_updateTimer; QScopedPointer<QTimer> m_updateTimer;
QScopedPointer<QOpenGLContext> m_context; QScopedPointer<QOpenGLContext> m_context;
QScopedPointer<QOffscreenSurface> m_offscreenSurface; QScopedPointer<QOffscreenSurface> m_offscreenSurface;