Merge branch 'master' into features/temperature-hwmon-by-name
This commit is contained in:
@@ -133,7 +133,7 @@ auto waybar::modules::Temperature::update() -> void {
|
||||
if (config_["tooltip-format"].isString()) {
|
||||
tooltip_format = config_["tooltip-format"].asString();
|
||||
}
|
||||
label_.set_tooltip_text(fmt::format(
|
||||
label_.set_tooltip_markup(fmt::format(
|
||||
fmt::runtime(tooltip_format), fmt::arg("temperatureC", temperature_c),
|
||||
fmt::arg("temperatureF", temperature_f), fmt::arg("temperatureK", temperature_k)));
|
||||
}
|
||||
@@ -187,3 +187,7 @@ bool waybar::modules::Temperature::isCritical(uint16_t temperature_c) {
|
||||
return config_["critical-threshold"].isInt() &&
|
||||
temperature_c >= config_["critical-threshold"].asInt();
|
||||
}
|
||||
|
||||
void waybar::modules::Temperature::suspend() { thread_.pause(); }
|
||||
|
||||
void waybar::modules::Temperature::resume() { thread_.resume(); }
|
||||
|
||||
Reference in New Issue
Block a user