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

Merge pull request #1588 from qubidt/custom-module-class 

Retain instance name css class for custom modules
pull/1590/head
Alex 2022-06-14 09:15:42 +02:00 committed by GitHub
parent 1b4a7b02f4 458c03bf95
commit 18a4f87a59
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/modules/custom.hpp
View File

@ -30,6 +30,7 @@ class Custom : public ALabel {
const std::string name_; const std::string name_;
std::string text_; std::string text_;
std::string id_;
std::string alt_; std::string alt_;
std::string tooltip_; std::string tooltip_;
std::vector<std::string> class_; std::vector<std::string> class_;

8
src/modules/custom.cpp
View File

@ -4,7 +4,12 @@
waybar::modules::Custom::Custom(const std::string& name, const std::string& id, waybar::modules::Custom::Custom(const std::string& name, const std::string& id,
const Json::Value& config) const Json::Value& config)
: ALabel(config, "custom-" + name, id, "{}"), name_(name), fp_(nullptr), pid_(-1) { : ALabel(config, "custom-" + name, id, "{}"),
name_(name),
id_(id),
percentage_(0),
fp_(nullptr),
pid_(-1) {
dp.emit(); dp.emit();
if (interval_.count() > 0) { if (interval_.count() > 0) {
delayWorker(); delayWorker();
@ -140,6 +145,7 @@ auto waybar::modules::Custom::update() -> void {
} }
auto classes = label_.get_style_context()->list_classes(); auto classes = label_.get_style_context()->list_classes();
for (auto const& c : classes) { for (auto const& c : classes) {
if (c == id_) continue;
label_.get_style_context()->remove_class(c); label_.get_style_context()->remove_class(c);
} }
for (auto const& c : class_) { for (auto const& c : class_) {