[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [kwin/Plasma/5.7] plugins/platforms: [platforms] Call setSoftWareCursor in init instead of ctor
From:       Martin_Gräßlin <mgraesslin () kde ! org>
Date:       2016-06-29 6:51:23
Message-ID: E1bI9LH-0006WM-P9 () code ! kde ! org
[Download RAW message or body]

Git commit feadcea6cea7b74acf4896c85dcb7d577615ff42 by Martin Gräßlin.
Committed on 29/06/2016 at 06:48.
Pushed by graesslin into branch 'Plasma/5.7'.

[platforms] Call setSoftWareCursor in init instead of ctor

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

M  +1    -1    plugins/platforms/fbdev/fb_backend.cpp
M  +1    -1    plugins/platforms/virtual/virtual_backend.cpp

http://commits.kde.org/kwin/feadcea6cea7b74acf4896c85dcb7d577615ff42

diff --git a/plugins/platforms/fbdev/fb_backend.cpp \
b/plugins/platforms/fbdev/fb_backend.cpp index 95b0925..fc7ed42 100644
--- a/plugins/platforms/fbdev/fb_backend.cpp
+++ b/plugins/platforms/fbdev/fb_backend.cpp
@@ -38,7 +38,6 @@ namespace KWin
 FramebufferBackend::FramebufferBackend(QObject *parent)
     : Platform(parent)
 {
-    setSoftWareCursor(true);
 }
 
 FramebufferBackend::~FramebufferBackend()
@@ -61,6 +60,7 @@ QPainterBackend *FramebufferBackend::createQPainterBackend()
 
 void FramebufferBackend::init()
 {
+    setSoftWareCursor(true);
     LogindIntegration *logind = LogindIntegration::self();
     auto takeControl = [logind, this]() {
         if (logind->hasSessionControl()) {
diff --git a/plugins/platforms/virtual/virtual_backend.cpp \
b/plugins/platforms/virtual/virtual_backend.cpp index b231fbb..396b56c 100644
--- a/plugins/platforms/virtual/virtual_backend.cpp
+++ b/plugins/platforms/virtual/virtual_backend.cpp
@@ -42,7 +42,6 @@ VirtualBackend::VirtualBackend(QObject *parent)
             qDebug() << "Screenshots saved to: " << m_screenshotDir->path();
         }
     }
-    setSoftWareCursor(true);
     setSupportsPointerWarping(true);
 }
 
@@ -50,6 +49,7 @@ VirtualBackend::~VirtualBackend() = default;
 
 void VirtualBackend::init()
 {
+    setSoftWareCursor(true);
     m_size = initialWindowSize();
     setReady(true);
     waylandServer()->seat()->setHasPointer(true);


[prev in list] [next in list] [prev in thread] [next in thread]