lainns-mirror/noctalia-shell
1
0
Fork 0
mirror of https://github.com/noctalia-dev/noctalia-shell.git synced 2026-05-11 17:08:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(tray): undid breaking

Browse Source
This commit is contained in:
Mathew-D
2026-05-10 21:23:12 -04:00
parent 4d83376208
commit 2b96a2cd09
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/dbus/tray/tray_service.cpp
+8 -4
View File
@@ -341,6 +341,12 @@ namespace {
return true;
}
const std::vector<std::string>& requestedMenuProperties() {
// Per dbusmenu protocol, an empty property list means "all available properties".
static const std::vector<std::string> kRequestedMenuProperties = {};
return kRequestedMenuProperties;
}
std::vector<std::int32_t> int32ListFromVariant(const sdbus::Variant& value) {
try {
return value.get<std::vector<std::int32_t>>();
@@ -657,8 +663,7 @@ bool TrayService::fetchMenuProperties(const std::string& itemId, const std::vect
cache.proxy->callMethod("GetGroupProperties")
.onInterface(k_menu_interface)
.withTimeout(std::chrono::milliseconds(1000))
// Per dbusmenu protocol, an empty property list means "all available properties".
.withArguments(entryIds, std::vector<std::string>{})
.withArguments(entryIds, requestedMenuProperties())
.storeResultsTo(properties);
std::unordered_map<std::int32_t, std::map<std::string, sdbus::Variant>> propertiesById;
@@ -772,8 +777,7 @@ void TrayService::requestMenuLayoutAfterAboutToShow(const std::string& itemId, s
cache.proxy->callMethodAsync("GetLayout")
.onInterface(k_menu_interface)
.withTimeout(std::chrono::milliseconds(2000))
// Per dbusmenu protocol, an empty property list means "all available properties".
.withArguments(parentId, static_cast<std::int32_t>(-1), std::vector<std::string>{})
.withArguments(parentId, static_cast<std::int32_t>(-1), requestedMenuProperties())
.uponReplyInvoke([this, itemId, parentId, generation](std::optional<sdbus::Error> error, std::uint32_t revision,
DbusMenuLayout layout) {
auto replyCacheIt = m_menuCache.find(itemId);