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

feat(cpu): add {icons} format replacement for all per-core icons

Browse Source 
Concatenates all per-core icons into a single {icons} placeholder,
so configs work across machines with different core counts without
manually specifying {icon0}{icon1}...{iconN}.

Closes #4240
This commit is contained in:
Ivan Ribeiro
2026-05-19 21:21:56 +01:00
parent 05945748dc
commit 6bdafede07
3 changed files with 22 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/cpu.cpp
+5 -1
View File
@@ -48,13 +48,17 @@ auto waybar::modules::Cpu::update() -> void {
store.push_back(fmt::arg("avg_frequency", avg_frequency));
std::vector<std::string> arg_names;
arg_names.reserve(cpu_usage.size() * 2);
std::string all_icons;
for (size_t i = 1; i < cpu_usage.size(); ++i) {
auto core_i = i - 1;
arg_names.push_back(fmt::format("usage{}", core_i));
store.push_back(fmt::arg(arg_names.back().c_str(), cpu_usage[i]));
auto core_icon = getIcon(cpu_usage[i], icons);
all_icons += core_icon;
arg_names.push_back(fmt::format("icon{}", core_i));
store.push_back(fmt::arg(arg_names.back().c_str(), getIcon(cpu_usage[i], icons)));
store.push_back(fmt::arg(arg_names.back().c_str(), core_icon));
}
store.push_back(fmt::arg("icons", all_icons));
label_.set_markup(fmt::vformat(format, store));
if (tooltipEnabled()) {