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

Don't check window system when creating SceneQPainter

Browse source 
Summary:
For one SceneQPainter is only used on Wayland and it can be created
through the Platform, so no different code pathes needed even if we
had SceneQPainter on X11.

Reviewers: #plasma

Subscribers: plasma-devel

Projects: #plasma

Differential Revision: https://phabricator.kde.org/D1416
This commit is contained in:
Martin Gräßlin 2016-04-15 11:37:43 +02:00
parent 4ef07494bd
commit d47e206beb
1 changed files with 7 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
scene_qpainter.cpp
View file

@ -94,9 +94,7 @@ QImage *QPainterBackend::bufferForScreen(int screenId)
//**************************************** //****************************************
SceneQPainter *SceneQPainter::createScene(QObject *parent) SceneQPainter *SceneQPainter::createScene(QObject *parent)
{ {
QScopedPointer<QPainterBackend> backend; QScopedPointer<QPainterBackend> backend(kwinApp()->platform()->createQPainterBackend());
if (kwinApp()->shouldUseWaylandForCompositing()) {
backend.reset(kwinApp()->platform()->createQPainterBackend());
if (backend.isNull()) { if (backend.isNull()) {
return nullptr; return nullptr;
} }
@ -104,8 +102,6 @@ SceneQPainter *SceneQPainter::createScene(QObject *parent)
return NULL; return NULL;
} }
return new SceneQPainter(backend.take(), parent); return new SceneQPainter(backend.take(), parent);
}
return NULL;
} }
SceneQPainter::SceneQPainter(QPainterBackend *backend, QObject *parent) SceneQPainter::SceneQPainter(QPainterBackend *backend, QObject *parent)