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

added tooltip-format-<short_description> on hyprland/language tooltip

Browse Source
This commit is contained in:
Victor Perez Cano
2024-10-19 17:30:23 +02:00
parent 696f7e1542
commit 550d108a03
2 changed files with 23 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/modules/hyprland/language.hpp
-1
View File
@@ -35,7 +35,6 @@ class Language : public waybar::ALabel, public EventHandler {
std::mutex mutex_; std::mutex mutex_;
const Bar& bar_; const Bar& bar_;
util::JsonParser parser_; util::JsonParser parser_;
const bool tooltip_format_enabled_;
Layout layout_; Layout layout_;
}; };
src/modules/hyprland/language.cpp
+20 -11
View File
@@ -11,8 +11,7 @@ namespace waybar::modules::hyprland {
Language::Language(const std::string& id, const Bar& bar, const Json::Value& config) Language::Language(const std::string& id, const Bar& bar, const Json::Value& config)
: ALabel(config, "language", id, "{}", 0, true), : ALabel(config, "language", id, "{}", 0, true),
bar_(bar), bar_(bar) {
tooltip_format_enabled_{config_["tooltip-format"].isString()} {
modulesReady = true; modulesReady = true;
if (!gIPC) { if (!gIPC) {
@@ -56,30 +55,40 @@ auto Language::update() -> void {
fmt::arg("shortDescription", layout_.short_description), fmt::arg("shortDescription", layout_.short_description),
fmt::arg("variant", layout_.variant))); fmt::arg("variant", layout_.variant)));
} }
spdlog::debug("hyprland language formatted layout name {}", layoutName); spdlog::debug("hyprland language formatted layout name {}", layoutName);
std::string tooltipContent = std::string{}; std::string tooltipContent = std::string{};
if (tooltipEnabled()) { bool tooltip_enabled = tooltipEnabled();
if (tooltip_format_enabled_) { if (tooltip_enabled) {
if (config_.isMember("tooltip-format")) {
auto tooltip_format = config_["tooltip-format"].asString(); auto tooltip_format = config_["tooltip-format"].asString();
tooltipContent = fmt::format(fmt::runtime(tooltip_format), if (config_.isMember("tooltip-format-" + layout_.short_description + "-" + layout_.variant)) {
fmt::arg("long", layout_.full_name), const auto propName = "tooltip-format-" + layout_.short_description + "-" + layout_.variant;
tooltipContent = fmt::format(fmt::runtime(tooltip_format), config_[propName].asString());
} else if (config_.isMember("tooltip-format-" + layout_.short_description)) {
const auto propName = "tooltip-format-" + layout_.short_description;
tooltipContent = fmt::format(fmt::runtime(tooltip_format), config_[propName].asString());
} else {
tooltipContent = trim(fmt::format(fmt::runtime(tooltip_format), fmt::arg("long", layout_.full_name),
fmt::arg("short", layout_.short_name), fmt::arg("short", layout_.short_name),
fmt::arg("shortDescription", layout_.short_description), fmt::arg("shortDescription", layout_.short_description),
fmt::arg("variant", layout_.variant)); fmt::arg("variant", layout_.variant)));
}
} else { }
else {
// if no tooltip format is provided, use the same text as the module
tooltipContent = layoutName; tooltipContent = layoutName;
} }
spdlog::debug("hyprland language formatted tooltip content {}", tooltipContent);
} }
spdlog::debug("hyprland language formatted tooltip content {}", tooltipContent);
if (!format_.empty()) { if (!format_.empty()) {
label_.show(); label_.show();
label_.set_markup(layoutName); label_.set_markup(layoutName);
if (tooltip_enabled) {
label_.set_tooltip_markup(tooltipContent); label_.set_tooltip_markup(tooltipContent);
}
} else { } else {
label_.hide(); label_.hide();
} }