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

Merge pull request #3099 from kkvark/master

master
Alexis Rouillard 2024-04-01 07:53:23 +02:00 committed by GitHub
parent ddc767cd81 9b4fc6d16b
commit 3de9e0cbd3
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -299,12 +299,13 @@ auto Workspaces::update() -> void {
if (needReorder) { if (needReorder) {
box_.reorder_child(button, it - workspaces_.begin()); box_.reorder_child(button, it - workspaces_.begin());
} }
bool noNodes = (*it)["nodes"].empty() && (*it)["floating_nodes"].empty();
if (hasFlag((*it), "focused")) { if (hasFlag((*it), "focused")) {
button.get_style_context()->add_class("focused"); button.get_style_context()->add_class("focused");
} else { } else {
button.get_style_context()->remove_class("focused"); button.get_style_context()->remove_class("focused");
} }
if (hasFlag((*it), "visible") || ((*it)["output"].isString() && (*it)["nodes"].size() == 0)) { if (hasFlag((*it), "visible") || ((*it)["output"].isString() && noNodes )) {
button.get_style_context()->add_class("visible"); button.get_style_context()->add_class("visible");
} else { } else {
button.get_style_context()->remove_class("visible"); button.get_style_context()->remove_class("visible");
@ -319,7 +320,7 @@ auto Workspaces::update() -> void {
} else { } else {
button.get_style_context()->remove_class("persistent"); button.get_style_context()->remove_class("persistent");
} }
if ((*it)["nodes"].size() == 0) { if (noNodes) {
button.get_style_context()->add_class("empty"); button.get_style_context()->add_class("empty");
} else { } else {
button.get_style_context()->remove_class("empty"); button.get_style_context()->remove_class("empty");
@ -406,7 +407,7 @@ std::string Workspaces::getIcon(const std::string &name, const Json::Value &node
} }
} }
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() && hasFlag(node, key)) {
return config_["format-icons"][key].asString(); return config_["format-icons"][key].asString();
} }
} else if (config_["format-icons"]["persistent"].isString() && } else if (config_["format-icons"]["persistent"].isString() &&