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

Formatting

pull/1722/head
Samuel Grahn 2022-10-15 12:05:49 +02:00
parent 8a360957f4
commit c41c86da13
1 changed files with 65 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

131
src/modules/custom_list.cpp
View File

@ -132,82 +132,81 @@ auto waybar::modules::CustomList::update() -> void {
} }
bool needReorder = false; bool needReorder = false;
for(auto res = results_.begin(); res != results_.end(); res++) { for(auto res = results_.begin(); res != results_.end(); res++) {
std::string name = (*res)["name"].asString();
auto bit = buttons_.find(name);
if(bit == buttons_.end()) {
needReorder = true;
}
auto &button = bit == buttons_.end() ? addButton(*res) : bit->second;
std::string name = (*res)["name"].asString(); auto prev = std::find_if(prev_.begin(), prev_.end(), [name](auto p) {
auto bit = buttons_.find(name); return p["name"] == name;
if(bit == buttons_.end()) { });
needReorder = true;
}
auto &button = bit == buttons_.end() ? addButton(*res) : bit->second;
auto prev = std::find_if(prev_.begin(), prev_.end(), [name](auto p) { // Classes
return p["name"] == name; std::vector<std::string> prev_classes;
}); if(prev != prev_.end()) {
if ((*prev)["class"].isString()) {
prev_classes.push_back((*prev)["class"].asString());
} else if ((*prev)["class"].isArray()) {
for (auto const& c : (*prev)["class"]) {
prev_classes.push_back(c.asString());
}
}
}
std::vector<std::string> new_classes;
if ((*res)["class"].isString()) {
new_classes.push_back((*res)["class"].asString());
} else if ((*res)["class"].isArray()) {
for (auto const& c : (*res)["class"]) {
new_classes.push_back(c.asString());
}
}
// Classes for(auto it : prev_classes) {
std::vector<std::string> prev_classes; if(std::find(new_classes.begin(), new_classes.end(), it) == new_classes.end())
if(prev != prev_.end()) { button.get_style_context()->remove_class(it);
if ((*prev)["class"].isString()) { }
prev_classes.push_back((*prev)["class"].asString()); for(auto it : new_classes) {
} else if ((*prev)["class"].isArray()) { if(std::find(prev_classes.begin(), prev_classes.end(), it) == prev_classes.end())
for (auto const& c : (*prev)["class"]) { button.get_style_context()->add_class(it);
prev_classes.push_back(c.asString()); }
}
}
}
std::vector<std::string> new_classes;
if ((*res)["class"].isString()) {
new_classes.push_back((*res)["class"].asString());
} else if ((*res)["class"].isArray()) {
for (auto const& c : (*res)["class"]) {
new_classes.push_back(c.asString());
}
}
for(auto it : prev_classes) { // Reorder to match results order
if(std::find(new_classes.begin(), new_classes.end(), it) == new_classes.end()) if(needReorder) {
button.get_style_context()->remove_class(it); box_.reorder_child(button, res - results_.begin());
} }
for(auto it : new_classes) {
if(std::find(prev_classes.begin(), prev_classes.end(), it) == prev_classes.end())
button.get_style_context()->add_class(it);
}
// Reorder to match results order if(!(*res)["disable-markup"].asBool()) {
if(needReorder) { static_cast<Gtk::Label *>(button.get_children()[0])->set_markup((*res)["text"].asString());
box_.reorder_child(button, res - results_.begin()); } else {
} button.set_label((*res)["text"].asString());
}
if(!(*res)["disable-markup"].asBool()) { if((*res)["hide"].asBool()) {
static_cast<Gtk::Label *>(button.get_children()[0])->set_markup((*res)["text"].asString()); button.hide();
} else { } else {
button.set_label((*res)["text"].asString()); button.show();
} }
if((*res)["hide"].asBool()) { if(button.get_tooltip_markup() != (*res)["tooltip"].asString()) {
button.hide(); button.set_tooltip_markup((*res)["tooltip"].asString());
} else { }
button.show();
}
if(button.get_tooltip_markup() != (*res)["tooltip"].asString()) {
button.set_tooltip_markup((*res)["tooltip"].asString());
}
} }
for(auto prev : prev_) { void name()or(auto prev : prev_) {
auto res_it = std::find_if(results_.begin(), results_.end(), [prev](auto it) { auto res_it = std::find_if(results_.begin(), results_.end(), [prev](auto it) {
return it["name"] == prev["name"]; return it["name"] == prev["name"];
}); });
if(res_it == results_.end()) { if(res_it == results_.end()) {
// Node has been removed // Node has been removed
auto bit = buttons_.find(prev["name"].asString()); auto bit = buttons_.find(prev["name"].asString());
if(bit != buttons_.end()) { if(bit != buttons_.end()) {
auto &button = bit->second; auto &button = bit->second;
box_.remove(button); box_.remove(button);
buttons_.erase(bit); buttons_.erase(bit);
}
} }
}
} }
prev_ = results_; prev_ = results_;
@ -237,9 +236,9 @@ Gtk::Button &waybar::modules::CustomList::addButton(const Json::Value &node) {
button.set_name(name_ + node["name"].asString()); button.set_name(name_ + node["name"].asString());
button.set_relief(Gtk::RELIEF_NONE); button.set_relief(Gtk::RELIEF_NONE);
if(!config_["disable-click"].asBool()) { if(!config_["disable-click"].asBool()) {
button.signal_pressed().connect([this, node] { button.signal_pressed().connect([this, node] {
handleClick(node["name"].asString()); handleClick(node["name"].asString());
}); });
} }
return button; return button;
} }
@ -251,7 +250,7 @@ void waybar::modules::CustomList::parseOutputJson() {
while (getline(output, line)) { while (getline(output, line)) {
auto parsed = parser_.parse(line); auto parsed = parser_.parse(line);
if(!parsed["data"].isArray()) { if(!parsed["data"].isArray()) {
throw std::runtime_error("Output should be a list"); throw std::runtime_error("Output should be a list");
} }
results_.clear(); results_.clear();
for(auto it : parsed["data"]) { for(auto it : parsed["data"]) {