tobias/waybar
1
0
Fork 0
mirror of https://github.com/rad4day/Waybar.git synced 2023-12-21 10:22:59 +01:00
Code Issues Packages Projects Releases Wiki Activity

feat(temperature): format-icons

Browse Source
This commit is contained in:
Alex
2019-05-13 11:31:05 +02:00
parent 62f8af8a39
commit fcb23d3104
4 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/ALabel.cpp
View File

@ -109,7 +109,7 @@ bool waybar::ALabel::handleScroll(GdkEventScroll* e) {
return true;
}
std::string waybar::ALabel::getIcon(uint16_t percentage, const std::string& alt) {
std::string waybar::ALabel::getIcon(uint16_t percentage, const std::string& alt, uint16_t max) {
auto format_icons = config_["format-icons"];
if (format_icons.isObject()) {
if (!alt.empty() && (format_icons[alt].isString() || format_icons[alt].isArray())) {
@ -120,7 +120,7 @@ std::string waybar::ALabel::getIcon(uint16_t percentage, const std::string& alt)
}
if (format_icons.isArray()) {
auto size = format_icons.size();
auto idx = std::clamp(percentage / (100 / size), 0U, size - 1);
auto idx = std::clamp(percentage / ((max == 0 ? 100 : max) / size), 0U, size - 1);
format_icons = format_icons[idx];
}
if (format_icons.isString()) {
@ -130,6 +130,9 @@ std::string waybar::ALabel::getIcon(uint16_t percentage, const std::string& alt)
}
std::string waybar::ALabel::getState(uint8_t value) {
if (!config_["states"].isObject()) {
return "";
}
// Get current state
std::vector<std::pair<std::string, uint8_t>> states;
if (config_["states"].isObject()) {

7
src/modules/temperature.cpp
View File

@ -32,8 +32,11 @@ auto waybar::modules::Temperature::update() -> void {
} else {
label_.get_style_context()->remove_class("critical");
}
label_.set_markup(fmt::format(
format, fmt::arg("temperatureC", temperature_c), fmt::arg("temperatureF", temperature_f)));
auto max_temp = config_["critical-threshold"].isInt() ? config_["critical-threshold"].asInt() : 0;
label_.set_markup(fmt::format(format,
fmt::arg("temperatureC", temperature_c),
fmt::arg("temperatureF", temperature_f),
fmt::arg("icon", getIcon(temperature_c, "", max_temp))));
}
std::tuple<uint16_t, uint16_t> waybar::modules::Temperature::getTemperature() {