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

Merge remote-tracking branch 'origin/mig-F' into refactor/generic-tooltip

Browse Source
This commit is contained in:
Alex
2026-07-04 00:06:12 +02:00
parent 0cd52b46ec cdfd3cb08a
commit f059337beb
3 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/clock.cpp
+1 -1
View File
@@ -162,7 +162,7 @@ auto waybar::modules::Clock::update() -> void {
const auto* tz = tzList_[tzCurrIdx_] != nullptr ? tzList_[tzCurrIdx_] : local_zone(); const auto* tz = tzList_[tzCurrIdx_] != nullptr ? tzList_[tzCurrIdx_] : local_zone();
const zoned_time now{tz, floor<seconds>(system_clock::now())}; const zoned_time now{tz, floor<seconds>(system_clock::now())};
label_.set_markup(fmt_lib::vformat(m_locale_, format_, fmt_lib::make_format_args(now))); setLabelMarkup(fmt_lib::vformat(m_locale_, format_, fmt_lib::make_format_args(now)));
if (tooltipEnabled()) { if (tooltipEnabled()) {
const year_month_day today{floor<days>(now.get_local_time())}; const year_month_day today{floor<days>(now.get_local_time())};
src/modules/custom.cpp
+2 -5
View File
@@ -187,7 +187,7 @@ auto waybar::modules::Custom::update() -> void {
if ((config_["hide-empty-text"].asBool() && text_.empty()) || str.empty()) { if ((config_["hide-empty-text"].asBool() && text_.empty()) || str.empty()) {
event_box_.hide(); event_box_.hide();
} else { } else {
label_.set_markup(str); setLabelMarkup(str);
if (tooltipEnabled()) { if (tooltipEnabled()) {
std::string tooltip_markup; std::string tooltip_markup;
if (tooltip_format_enabled_) { if (tooltip_format_enabled_) {
@@ -202,10 +202,7 @@ auto waybar::modules::Custom::update() -> void {
tooltip_markup = tooltip_; tooltip_markup = tooltip_;
} }
if (last_tooltip_markup_ != tooltip_markup) { setTooltipMarkup(tooltip_markup);
label_.set_tooltip_markup(tooltip_markup);
last_tooltip_markup_ = std::move(tooltip_markup);
}
} }
auto style = label_.get_style_context(); auto style = label_.get_style_context();
auto classes = style->list_classes(); auto classes = style->list_classes();
src/modules/mpris/mpris.cpp
+2 -2
View File
@@ -735,7 +735,7 @@ auto Mpris::update() -> void {
if (label_format.empty()) { if (label_format.empty()) {
label_.hide(); label_.hide();
} else { } else {
label_.set_markup(label_format); setLabelMarkup(label_format);
label_.show(); label_.show();
} }
} catch (fmt::format_error const& e) { } catch (fmt::format_error const& e) {
@@ -758,7 +758,7 @@ auto Mpris::update() -> void {
fmt::arg("player_icon", getIconFromJson(config_["player-icons"], info.name)), fmt::arg("player_icon", getIconFromJson(config_["player-icons"], info.name)),
fmt::arg("status_icon", getIconFromJson(config_["status-icons"], info.status_string))); fmt::arg("status_icon", getIconFromJson(config_["status-icons"], info.status_string)));
label_.set_tooltip_markup(tooltip_text); setTooltipMarkup(tooltip_text);
} catch (fmt::format_error const& e) { } catch (fmt::format_error const& e) {
spdlog::warn("mpris: format error (tooltip): {}", e.what()); spdlog::warn("mpris: format error (tooltip): {}", e.what());
} }