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

[platforms] Call setSoftWareCursor in init instead of ctor

Browse source 
Summary:
Platform::setSoftWareCursor creates connections to the Cursor in order
to trigger repaints whenever the cursor position changes. The Cursor is
created before Platform::init is called, but after the Platform is
created. Thus the call needs to happen in init, otherwise the cursor
is not rendered correctly.

BUG: 356328
FIXED-IN: 5.7.0

Reviewers: #kwin, #plasma_on_wayland

Subscribers: plasma-devel, kwin

Tags: #plasma_on_wayland, #kwin

Differential Revision: https://phabricator.kde.org/D2025
This commit is contained in:
Martin Gräßlin 2016-06-28 08:43:57 +02:00
parent fd19db0fbe
commit feadcea6ce
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
plugins/platforms/fbdev/fb_backend.cpp
View file

@ -38,7 +38,6 @@ namespace KWin
FramebufferBackend::FramebufferBackend(QObject *parent) FramebufferBackend::FramebufferBackend(QObject *parent)
: Platform(parent) : Platform(parent)
{ {
setSoftWareCursor(true);
} }
FramebufferBackend::~FramebufferBackend() FramebufferBackend::~FramebufferBackend()
@ -61,6 +60,7 @@ QPainterBackend *FramebufferBackend::createQPainterBackend()
void FramebufferBackend::init() void FramebufferBackend::init()
{ {
setSoftWareCursor(true);
LogindIntegration *logind = LogindIntegration::self(); LogindIntegration *logind = LogindIntegration::self();
auto takeControl = [logind, this]() { auto takeControl = [logind, this]() {
if (logind->hasSessionControl()) { if (logind->hasSessionControl()) {

2
plugins/platforms/virtual/virtual_backend.cpp
View file

@ -42,7 +42,6 @@ VirtualBackend::VirtualBackend(QObject *parent)
qDebug() << "Screenshots saved to: " << m_screenshotDir->path(); qDebug() << "Screenshots saved to: " << m_screenshotDir->path();
} }
} }
setSoftWareCursor(true);
setSupportsPointerWarping(true); setSupportsPointerWarping(true);
} }
@ -50,6 +49,7 @@ VirtualBackend::~VirtualBackend() = default;
void VirtualBackend::init() void VirtualBackend::init()
{ {
setSoftWareCursor(true);
m_size = initialWindowSize(); m_size = initialWindowSize();
setReady(true); setReady(true);
waylandServer()->seat()->setHasPointer(true); waylandServer()->seat()->setHasPointer(true);