Akatsuki-Misaki/dde-dock
1
0
Fork 0
mirror of https://github.com/linuxdeepin/dde-dock.git synced 2025-06-04 17:33:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(tray): indicator click is invalid

Browse Source
This commit is contained in:
justforlxz 2019-05-17 16:22:40 +08:00
parent df67738cf0
commit 2840c86844
No known key found for this signature in database
GPG Key ID: 593AFD577C1B1A60
1 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
plugins/tray/indicatortray.cpp
View File

@ -11,6 +11,7 @@
#include <QFile>
#include <QTimer>
#include <QDBusMessage>
#include <thread>
class IndicatorTrayPrivate
{
@ -176,16 +177,19 @@ void IndicatorTrayPrivate::initDBus(const QString &indicatorName)
const QJsonObject action = config.value("action").toObject();
if (!action.isEmpty())
q->connect(indicatorTrayWidget, &IndicatorTrayWidget::clicked, q, [ = ](uint8_t button_index, int x, int y) {
auto triggerConfig = action.value("trigger").toObject();
auto dbusService = triggerConfig.value("dbus_service").toString();
auto dbusPath = triggerConfig.value("dbus_path").toString();
auto dbusInterface = triggerConfig.value("dbus_interface").toString();
auto methodName = triggerConfig.value("dbus_method").toString();
auto isSystemBus = triggerConfig.value("system_dbus").toBool(false);
auto bus = isSystemBus ? QDBusConnection::systemBus() : QDBusConnection::sessionBus();
std::thread t([=]() -> void {
auto triggerConfig = action.value("trigger").toObject();
auto dbusService = triggerConfig.value("dbus_service").toString();
auto dbusPath = triggerConfig.value("dbus_path").toString();
auto dbusInterface = triggerConfig.value("dbus_interface").toString();
auto methodName = triggerConfig.value("dbus_method").toString();
auto isSystemBus = triggerConfig.value("system_dbus").toBool(false);
auto bus = isSystemBus ? QDBusConnection::systemBus() : QDBusConnection::sessionBus();
QDBusInterface interface(dbusService, dbusPath, dbusInterface, bus, q);
interface.asyncCall(methodName, button_index, x, y);
QDBusInterface interface(dbusService, dbusPath, dbusInterface, bus);
qDebug() << interface.call(methodName, button_index, x, y);
});
t.detach();
});
});
}