diff --git a/shell/dbus/org.kde.PlasmaShell.xml b/shell/dbus/org.kde.PlasmaShell.xml --- a/shell/dbus/org.kde.PlasmaShell.xml +++ b/shell/dbus/org.kde.PlasmaShell.xml @@ -27,8 +27,6 @@ - - diff --git a/shell/shellcorona.h b/shell/shellcorona.h --- a/shell/shellcorona.h +++ b/shell/shellcorona.h @@ -139,7 +139,6 @@ void loadKWinScriptInInteractiveConsole(const QString &script); void toggleActivityManager(); void evaluateScript(const QString &string); - void toggleLauncherMenu(); void activateLauncherMenu(); QByteArray dumpCurrentLayoutJS() const; @@ -213,7 +212,6 @@ void reconsiderOutputs(); QList panelsForScreen(QScreen *screen) const; DesktopView* desktopForScreen(QScreen *screen) const; - Plasma::Applet *findLauncherMenu() const; void setupWaylandIntegration(); void executeSetupPlasmoidScript(Plasma::Containment *containment, Plasma::Applet *applet); diff --git a/shell/shellcorona.cpp b/shell/shellcorona.cpp --- a/shell/shellcorona.cpp +++ b/shell/shellcorona.cpp @@ -1950,34 +1950,21 @@ } } -void ShellCorona::toggleLauncherMenu() -{ - auto applet = findLauncherMenu(); - if (applet && !applet->globalShortcut().isEmpty()) { - emit applet->toggled(); - } -} void ShellCorona::activateLauncherMenu() { - auto applet = findLauncherMenu(); - if (applet && !applet->globalShortcut().isEmpty()) { - emit applet->activated(); - } -} - -Plasma::Applet *ShellCorona::findLauncherMenu() const -{ for (auto it = m_panelViews.constBegin(), end = m_panelViews.constEnd(); it != end; ++it) { const auto applets = it.key()->applets(); for (auto applet : applets) { const auto provides = KPluginMetaData::readStringList(applet->pluginMetaData().rawData(), QStringLiteral("X-Plasma-Provides")); if (provides.contains(QLatin1String("org.kde.plasma.launchermenu"))) { - return applet; + if (!applet->globalShortcut().isEmpty()) { + emit applet->activated(); + return; + } } } } - return nullptr; } // Desktop corona handler