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

fix(Custom): only set id when getting an output

This commit is contained in:
Alexis 2018-08-28 11:10:36 +02:00
parent 53956d9d18
commit 9a1b8bb831
No known key found for this signature in database
GPG Key ID: 20B1EC2EBBA96BD9
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/modules/custom.cpp
View File

@ -7,7 +7,6 @@ waybar::modules::Custom::Custom(const std::string name,
if (!config_["exec"]) { if (!config_["exec"]) {
throw std::runtime_error(name_ + " has no exec path."); throw std::runtime_error(name_ + " has no exec path.");
} }
label_.set_name("custom-" + name_);
worker(); worker();
} }
@ -21,6 +20,7 @@ void waybar::modules::Custom::worker()
if (res.exit_code != 0) { if (res.exit_code != 0) {
can_update = false; can_update = false;
label_.hide(); label_.hide();
label_.set_name("");
} }
} }
if (can_update) { if (can_update) {
@ -37,7 +37,9 @@ auto waybar::modules::Custom::update() -> void
// Hide label if output is empty // Hide label if output is empty
if (res.out.empty() || res.exit_code != 0) { if (res.out.empty() || res.exit_code != 0) {
label_.hide(); label_.hide();
label_.set_name("");
} else { } else {
label_.set_name("custom-" + name_);
auto str = fmt::format(format_, res.out); auto str = fmt::format(format_, res.out);
label_.set_text(str); label_.set_text(str);
label_.set_tooltip_text(str); label_.set_tooltip_text(str);