poz/quickshell
1
0
Fork 0
forked from quickshell/quickshell
Code Pull requests Activity

service/tray: account for more edge cases and add placeholder img

Browse source
This commit is contained in:
outfoxxed 2024-04-19 04:12:26 -07:00
parent 54bf485101
commit 61812343f5
Signed by untrusted user: outfoxxed
GPG key ID: 4C88A185FB89301E
7 changed files with 117 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/services/status_notifier/item.cpp
View file

@ -25,11 +25,15 @@ Q_LOGGING_CATEGORY(logStatusNotifierItem, "quickshell.service.sni.item", QtWarni
namespace qs::service::sni {
StatusNotifierItem::StatusNotifierItem(const QString& address, QObject* parent): QObject(parent) {
// spec is unclear about what exactly an item address is, so split off anything but the connection path
auto conn = address.split("/").value(0);
this->item =
new DBusStatusNotifierItem(conn, "/StatusNotifierItem", QDBusConnection::sessionBus(), this);
StatusNotifierItem::StatusNotifierItem(const QString& address, QObject* parent)
: QObject(parent)
, watcherId(address) {
// spec is unclear about what exactly an item address is, so account for both combinations
auto splitIdx = address.indexOf('/');
auto conn = splitIdx == -1 ? address : address.sliced(0, splitIdx);
auto path = splitIdx == -1 ? "/StatusNotifierItem" : address.sliced(splitIdx);
this->item = new DBusStatusNotifierItem(conn, path, QDBusConnection::sessionBus(), this);
if (!this->item->isValid()) {
qCWarning(logStatusNotifierHost).noquote() << "Cannot create StatusNotifierItem for" << conn;
@ -85,8 +89,7 @@ QString StatusNotifierItem::iconId() const {
if (!name.isEmpty() && overlayName.isEmpty()) return QString("image://icon/") + name;
}
return QString("image://service.sni/") + this->item->service() + "/"
+ QString::number(this->iconIndex);
return QString("image://service.sni/") + this->watcherId + "/" + QString::number(this->iconIndex);
}
QPixmap StatusNotifierItem::createPixmap(const QSize& size) const {