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

Add readability improvements and optimizations

Browse Source 
Replace the inner loop with regex_replace. We're already using this
elsewhere and the performance difference isn't worth the loss of human
readability.

Use static const to pre-calc the search string.
This commit is contained in:
Nick Janetakis
2026-03-02 21:29:15 -05:00
parent 0c8acbf39e
commit c85f2a23de
1 changed files with 11 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/clock.cpp
+11 -16
View File
@@ -199,31 +199,26 @@ auto waybar::modules::Clock::update() -> void {
// to support proper classes anyone using them will continue to work. // to support proper classes anyone using them will continue to work.
auto context = label_.get_style_context(); auto context = label_.get_style_context();
const std::vector<std::pair<std::string, std::string>> calendar_class_map = { static const std::vector<std::pair<std::string, std::string>> calendar_class_map = {
{"calendar-today", "today"}, {"calendar-today", "class='today'"},
{"calendar-days", "days"}, {"calendar-days", "class='days'"},
{"calendar-weeks", "weeks"}, {"calendar-weeks", "class='weeks'"},
{"calendar-weekdays", "weekdays"}, {"calendar-weekdays", "class='weekdays'"},
{"calendar-months", "months"} {"calendar-months", "class='months'"}
}; };
for (const auto& [css_class, json_key] : calendar_class_map) { for (const auto& [css_class, search_str] : calendar_class_map) {
try { try {
context->add_class(css_class); context->add_class(css_class);
Gdk::RGBA color = context->get_color(); const Gdk::RGBA color = context->get_color();
context->remove_class(css_class); context->remove_class(css_class);
std::string hex = fmt::format("#{:02x}{:02x}{:02x}", const std::string replace_str = fmt::format("color='#{:02x}{:02x}{:02x}'",
static_cast<int>(color.get_red() * 255), static_cast<int>(color.get_red() * 255,
static_cast<int>(color.get_green() * 255), static_cast<int>(color.get_green() * 255),
static_cast<int>(color.get_blue() * 255)); static_cast<int>(color.get_blue() * 255));
std::string search = "class='" + json_key + "'"; m_tlpText_ = std::regex_replace(m_tlpText_, std::regex(search_str), replace_str);
std::string replace = "color='" + hex + "'";
for (size_t pos = 0; (pos = m_tlpText_.find(search, pos)) != std::string::npos; pos += replace.length()) {
m_tlpText_.replace(pos, search.length(), replace);
}
} catch (const Glib::Error& e) { } catch (const Glib::Error& e) {
spdlog::warn("Clock: Failed to fetch CSS color for {}: {}", css_class, e.what().raw()); spdlog::warn("Clock: Failed to fetch CSS color for {}: {}", css_class, e.what().raw());
continue; continue;