mirror of
https://github.com/rad4day/Waybar.git
synced 2025-07-13 14:42:29 +02:00
Merge pull request #3068 from ordy/master
(Fix) Alt format on group modules
This commit is contained in:
10
src/bar.cpp
10
src/bar.cpp
@ -448,10 +448,20 @@ void waybar::Bar::setupAltFormatKeyForModuleList(const char* module_list_name) {
|
|||||||
if (config.isMember(module_list_name)) {
|
if (config.isMember(module_list_name)) {
|
||||||
Json::Value& modules = config[module_list_name];
|
Json::Value& modules = config[module_list_name];
|
||||||
for (const Json::Value& module_name : modules) {
|
for (const Json::Value& module_name : modules) {
|
||||||
|
if (module_name.isString()) {
|
||||||
|
auto ref = module_name.asString();
|
||||||
|
if (ref.compare(0, 6, "group/") == 0 && ref.size() > 6) {
|
||||||
|
Json::Value& group_modules = config[ref]["modules"];
|
||||||
|
for (const Json::Value& module_name : group_modules) {
|
||||||
if (module_name.isString()) {
|
if (module_name.isString()) {
|
||||||
setupAltFormatKeyForModule(module_name.asString());
|
setupAltFormatKeyForModule(module_name.asString());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
} else {
|
||||||
|
setupAltFormatKeyForModule(ref);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user