diff --git a/src/modules/network.cpp b/src/modules/network.cpp index 6935430e..74b54d91 100644 --- a/src/modules/network.cpp +++ b/src/modules/network.cpp @@ -342,7 +342,9 @@ auto waybar::modules::Network::update() -> void { fmt::arg("bandwidthDownBits", pow_format(bandwidth_down * 8ull / interval_.count(), "b/s")), fmt::arg("bandwidthUpBits", pow_format(bandwidth_up * 8ull / interval_.count(), "b/s")), fmt::arg("bandwidthDownOctets", pow_format(bandwidth_down / interval_.count(), "o/s")), - fmt::arg("bandwidthUpOctets", pow_format(bandwidth_up / interval_.count(), "o/s"))); + fmt::arg("bandwidthUpOctets", pow_format(bandwidth_up / interval_.count(), "o/s")), + fmt::arg("bandwidthDownBytes", pow_format(bandwidth_down / interval_.count(), "B/s")), + fmt::arg("bandwidthUpBytes", pow_format(bandwidth_up / interval_.count(), "B/s"))); if (text.compare(label_.get_label()) != 0) { label_.set_markup(text); if (text.empty()) { @@ -373,7 +375,9 @@ auto waybar::modules::Network::update() -> void { pow_format(bandwidth_down * 8ull / interval_.count(), "b/s")), fmt::arg("bandwidthUpBits", pow_format(bandwidth_up * 8ull / interval_.count(), "b/s")), fmt::arg("bandwidthDownOctets", pow_format(bandwidth_down / interval_.count(), "o/s")), - fmt::arg("bandwidthUpOctets", pow_format(bandwidth_up / interval_.count(), "o/s"))); + fmt::arg("bandwidthUpOctets", pow_format(bandwidth_up / interval_.count(), "o/s")), + fmt::arg("bandwidthDownBytes", pow_format(bandwidth_down / interval_.count(), "B/s")), + fmt::arg("bandwidthUpBytes", pow_format(bandwidth_up / interval_.count(), "B/s"))); if (label_.get_tooltip_text() != tooltip_text) { label_.set_tooltip_text(tooltip_text); } diff --git a/src/modules/temperature.cpp b/src/modules/temperature.cpp index 84560e8d..627ece90 100644 --- a/src/modules/temperature.cpp +++ b/src/modules/temperature.cpp @@ -34,6 +34,14 @@ auto waybar::modules::Temperature::update() -> void { } else { label_.get_style_context()->remove_class("critical"); } + + if(format.empty()) { + event_box_.hide(); + return; + } else { + event_box_.show(); + } + auto max_temp = config_["critical-threshold"].isInt() ? config_["critical-threshold"].asInt() : 0; label_.set_markup(fmt::format(format, fmt::arg("temperatureC", temperature_c),