Alex
8eb916ac84
Modules duplicated the same boilerplate to format their label and tooltip (read tooltip-format, fmt::format, set_tooltip_markup) across ~29 modules. Add updateLabelAndTooltip(labelFormat, tooltipDefault, args...) and its state-aware variant updateLabelAndTooltipForState(state, ...) to ALabel: they build a single fmt arg store, render the label and the resolved tooltip format (tooltip-format[-state] or default) through the dedup-aware setters, honoring the tooltip toggle. resolveTooltipFormat() centralizes the format resolution. Migrate temperature and disk as the first adopters.
86 lines
3.2 KiB
C++
86 lines
3.2 KiB
C++
#pragma once
|
|
|
|
#include <fmt/args.h>
|
|
#include <fmt/format.h>
|
|
#include <glibmm/markup.h>
|
|
#include <gtkmm/label.h>
|
|
#include <json/json.h>
|
|
|
|
#include <optional>
|
|
#include <string>
|
|
#include <utility>
|
|
|
|
#include "AModule.hpp"
|
|
|
|
namespace waybar {
|
|
|
|
class ALabel : public AModule {
|
|
public:
|
|
ALabel(const Json::Value&, const std::string&, const std::string&, const std::string& format,
|
|
uint16_t interval = 0, bool ellipsize = false, bool enable_click = false,
|
|
bool enable_scroll = false);
|
|
virtual ~ALabel() = default;
|
|
auto update() -> void override;
|
|
virtual std::string getIcon(uint16_t, const std::string& alt = "", uint16_t max = 0);
|
|
virtual std::string getIcon(uint16_t, const std::vector<std::string>& alts, uint16_t max = 0);
|
|
|
|
protected:
|
|
Gtk::Label label_;
|
|
std::string format_;
|
|
const std::chrono::milliseconds interval_;
|
|
bool alt_ = false;
|
|
std::string default_format_;
|
|
|
|
bool setLabelMarkup(const Glib::ustring& markup);
|
|
bool setTooltipMarkup(const Glib::ustring& markup);
|
|
|
|
// Resolve the tooltip format string: prefers `tooltip-format-<state>` (when a
|
|
// non-empty state is given), then `tooltip-format`, then `defaultFormat`.
|
|
std::string resolveTooltipFormat(const std::string& defaultFormat,
|
|
const std::string& state = "") const {
|
|
if (!state.empty() && config_["tooltip-format-" + state].isString()) {
|
|
return config_["tooltip-format-" + state].asString();
|
|
}
|
|
if (config_["tooltip-format"].isString()) {
|
|
return config_["tooltip-format"].asString();
|
|
}
|
|
return defaultFormat;
|
|
}
|
|
|
|
// Combined label + tooltip helper. Builds a single fmt argument store from
|
|
// `args`, renders `labelFormat` into the label and the resolved tooltip format
|
|
// into the tooltip, both through the dedup-aware setters. Honors the `tooltip`
|
|
// toggle. This replaces the label/tooltip formatting boilerplate that modules
|
|
// used to duplicate. `state` selects `tooltip-format-<state>` when non-empty.
|
|
template <typename... Args>
|
|
void updateLabelAndTooltipForState(const std::string& state, const std::string& labelFormat,
|
|
const std::string& tooltipDefault, Args&&... args) {
|
|
fmt::dynamic_format_arg_store<fmt::format_context> store;
|
|
(store.push_back(std::forward<Args>(args)), ...);
|
|
setLabelMarkup(fmt::vformat(labelFormat, store));
|
|
if (tooltipEnabled()) {
|
|
setTooltipMarkup(fmt::vformat(resolveTooltipFormat(tooltipDefault, state), store));
|
|
}
|
|
}
|
|
|
|
template <typename... Args>
|
|
void updateLabelAndTooltip(const std::string& labelFormat, const std::string& tooltipDefault,
|
|
Args&&... args) {
|
|
updateLabelAndTooltipForState("", labelFormat, tooltipDefault, std::forward<Args>(args)...);
|
|
}
|
|
|
|
bool handleToggle(GdkEventButton* const& e) override;
|
|
void copyToClipboard(const std::string&);
|
|
virtual std::string getState(uint8_t value, bool lesser = false);
|
|
|
|
std::map<std::string, GtkMenuItem*> submenus_;
|
|
std::map<std::string, std::string> menuActionsMap_;
|
|
static void handleGtkMenuEvent(GtkMenuItem* menuitem, gpointer data);
|
|
|
|
private:
|
|
std::optional<Glib::ustring> last_label_markup_;
|
|
std::optional<Glib::ustring> last_tooltip_markup_;
|
|
};
|
|
|
|
} // namespace waybar
|