RPJosh
/
Waybar
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

format

pull/2336/head
dmitry 2023-07-20 22:57:33 +03:00
parent d3bcff31e5
commit 05efdb74f0
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/modules/sway/workspaces.cpp
View File

@ -287,17 +287,19 @@ std::string Workspaces::getIcon(const std::string &name, const Json::Value &node
std::vector<std::string> keys = {"high-priority-named", "urgent", "focused", name, "default"}; std::vector<std::string> keys = {"high-priority-named", "urgent", "focused", name, "default"};
for (auto const &key : keys) { for (auto const &key : keys) {
if (key == "high-priority-named") { if (key == "high-priority-named") {
auto it = std::find_if(high_priority_named_.begin(), high_priority_named_.end(), auto it = std::find_if(high_priority_named_.begin(), high_priority_named_.end(),
[&](const std::string &member) { return member == name; }); [&](const std::string &member) { return member == name; });
if (it != high_priority_named_.end()) { if (it != high_priority_named_.end()) {
return config_["format-icons"][name].asString(); return config_["format-icons"][name].asString();
} }
it = std::find_if(high_priority_named_.begin(), high_priority_named_.end(), it = std::find_if(high_priority_named_.begin(), high_priority_named_.end(),
[&](const std::string &member) { return trimWorkspaceName(member) == trimWorkspaceName(name); }); [&](const std::string &member) {
if (it != high_priority_named_.end()) { return trimWorkspaceName(member) == trimWorkspaceName(name);
return config_["format-icons"][trimWorkspaceName(name)].asString(); });
} if (it != high_priority_named_.end()) {
return config_["format-icons"][trimWorkspaceName(name)].asString();
}
} }
if (key == "focused" || key == "urgent") { if (key == "focused" || key == "urgent") {
if (config_["format-icons"][key].isString() && node[key].asBool()) { if (config_["format-icons"][key].isString() && node[key].asBool()) {