clock: respect tooltip option

This commit is contained in:
giskard 2024-06-10 17:30:33 +08:00
parent 7721dcdae8
commit 1cd013a09b
1 changed files with 8 additions and 5 deletions

View File

@ -12,7 +12,8 @@
#ifdef HAVE_LANGINFO_1STDAY #ifdef HAVE_LANGINFO_1STDAY
#include <langinfo.h> #include <langinfo.h>
#include <locale.h>
#include <clocale>
#endif #endif
namespace fmt_lib = waybar::util::date::format; namespace fmt_lib = waybar::util::date::format;
@ -126,8 +127,10 @@ waybar::modules::Clock::Clock(const std::string& id, const Json::Value& config)
} }
} }
label_.set_has_tooltip(true); if (tooltipEnabled()) {
label_.signal_query_tooltip().connect(sigc::mem_fun(*this, &Clock::query_tlp_cb)); label_.set_has_tooltip(true);
label_.signal_query_tooltip().connect(sigc::mem_fun(*this, &Clock::query_tlp_cb));
}
thread_ = [this] { thread_ = [this] {
dp.emit(); dp.emit();
@ -194,8 +197,8 @@ const unsigned cldRowsInMonth(const year_month& ym, const weekday& firstdow) {
return 2u + ceil<weeks>((weekday{ym / 1} - firstdow) + ((ym / last).day() - day{0})).count(); return 2u + ceil<weeks>((weekday{ym / 1} - firstdow) + ((ym / last).day() - day{0})).count();
} }
auto cldGetWeekForLine(const year_month& ym, const weekday& firstdow, const unsigned line) auto cldGetWeekForLine(const year_month& ym, const weekday& firstdow,
-> const year_month_weekday { const unsigned line) -> const year_month_weekday {
unsigned index{line - 2}; unsigned index{line - 2};
if (weekday{ym / 1} == firstdow) ++index; if (weekday{ym / 1} == firstdow) ++index;
return ym / firstdow[index]; return ym / firstdow[index];