Commit 1caf9f61 authored by David Redondo's avatar David Redondo 🏎
Browse files

Disable bouncy cursor effect during ksplash

Since commit commits.kde.org/plasma-workspace/378309e666f52fc436c75648a9e6ad7d5dcbacdf
ksmserver sets a desktopname when restoring applications. This causes the effect
to draw above the splash windows while no cursor is visible.
parent c61ba64a
...@@ -3,12 +3,15 @@ ...@@ -3,12 +3,15 @@
This file is part of the KDE project. This file is part of the KDE project.
SPDX-FileCopyrightText: 2010 Martin Gräßlin <mgraesslin@kde.org> SPDX-FileCopyrightText: 2010 Martin Gräßlin <mgraesslin@kde.org>
SPDX-FileCopyrightText: 2020 David Redondo <kde@david-redondo.de>
SPDX-License-Identifier: GPL-2.0-or-later SPDX-License-Identifier: GPL-2.0-or-later
*/ */
#include "startupfeedback.h" #include "startupfeedback.h"
// Qt // Qt
#include <QApplication> #include <QApplication>
#include <QDBusConnectionInterface>
#include <QDBusServiceWatcher>
#include <QFile> #include <QFile>
#include <QSize> #include <QSize>
#include <QStyle> #include <QStyle>
...@@ -70,6 +73,7 @@ StartupFeedbackEffect::StartupFeedbackEffect() ...@@ -70,6 +73,7 @@ StartupFeedbackEffect::StartupFeedbackEffect()
, m_blinkingShader(nullptr) , m_blinkingShader(nullptr)
, m_cursorSize(24) , m_cursorSize(24)
, m_configWatcher(KConfigWatcher::create(KSharedConfig::openConfig("klaunchrc", KConfig::NoGlobals))) , m_configWatcher(KConfigWatcher::create(KSharedConfig::openConfig("klaunchrc", KConfig::NoGlobals)))
, m_splashVisible(false)
{ {
for (int i = 0; i < 5; ++i) { for (int i = 0; i < 5; ++i) {
m_bouncingTextures[i] = nullptr; m_bouncingTextures[i] = nullptr;
...@@ -87,6 +91,16 @@ StartupFeedbackEffect::StartupFeedbackEffect() ...@@ -87,6 +91,16 @@ StartupFeedbackEffect::StartupFeedbackEffect()
}); });
reconfigure(ReconfigureAll); reconfigure(ReconfigureAll);
m_splashVisible = QDBusConnection::sessionBus().interface()->isServiceRegistered(QStringLiteral("org.kde.KSplash"));
auto serviceWatcher = new QDBusServiceWatcher(QStringLiteral("org.kde.KSplash"), QDBusConnection::sessionBus(), QDBusServiceWatcher::WatchForOwnerChange, this);
connect(serviceWatcher, &QDBusServiceWatcher::serviceRegistered, this, [this] {
m_splashVisible = true;
stop();
});
connect(serviceWatcher, &QDBusServiceWatcher::serviceUnregistered, this, [this] {
m_splashVisible = false;
gotRemoveStartup(KStartupInfoId(), KStartupInfoData()); // Start the next feedback
});
} }
StartupFeedbackEffect::~StartupFeedbackEffect() StartupFeedbackEffect::~StartupFeedbackEffect()
...@@ -258,7 +272,7 @@ void StartupFeedbackEffect::gotStartupChange(const KStartupInfoId& id, const KSt ...@@ -258,7 +272,7 @@ void StartupFeedbackEffect::gotStartupChange(const KStartupInfoId& id, const KSt
void StartupFeedbackEffect::start(const QString& icon) void StartupFeedbackEffect::start(const QString& icon)
{ {
if (m_type == NoFeedback) if (m_type == NoFeedback || m_splashVisible)
return; return;
if (!m_active) if (!m_active)
effects->startMousePolling(); effects->startMousePolling();
......
...@@ -78,6 +78,7 @@ private: ...@@ -78,6 +78,7 @@ private:
GLShader *m_blinkingShader; GLShader *m_blinkingShader;
int m_cursorSize; int m_cursorSize;
KConfigWatcher::Ptr m_configWatcher; KConfigWatcher::Ptr m_configWatcher;
bool m_splashVisible;
}; };
} // namespace } // namespace
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment