Merge pull request #4529 from dimti/hyprland-language-class
Add css class to hyprland language module of short_name language code
This commit is contained in:
@@ -30,6 +30,8 @@ class Language : public waybar::ALabel, public EventHandler {
|
||||
std::string short_description;
|
||||
};
|
||||
|
||||
auto removeXkbLayoutCssClass() -> void;
|
||||
auto addXkbLayoutCssClass() -> void;
|
||||
static auto getLayout(const std::string&) -> Layout;
|
||||
|
||||
std::mutex mutex_;
|
||||
|
||||
@@ -130,7 +130,9 @@ void Language::onEvent(const std::string& ev) {
|
||||
|
||||
layoutName = waybar::util::sanitize_string(layoutName);
|
||||
|
||||
removeXkbLayoutCssClass();
|
||||
layout_ = getLayout(layoutName);
|
||||
addXkbLayoutCssClass();
|
||||
|
||||
spdlog::debug("hyprland language onevent with {}", layoutName);
|
||||
|
||||
@@ -152,6 +154,7 @@ void Language::initLanguage() {
|
||||
searcher = waybar::util::sanitize_string(searcher);
|
||||
|
||||
layout_ = getLayout(searcher);
|
||||
addXkbLayoutCssClass();
|
||||
|
||||
spdlog::debug("hyprland language initLanguage found {}", layout_.full_name);
|
||||
|
||||
@@ -161,6 +164,15 @@ void Language::initLanguage() {
|
||||
}
|
||||
}
|
||||
|
||||
auto Language::removeXkbLayoutCssClass() -> void {
|
||||
label_.get_style_context()->remove_class(layout_.short_name);
|
||||
spdlog::debug("hyprland language try to remove currently short_name css class {}", layout_.short_name);
|
||||
}
|
||||
auto Language::addXkbLayoutCssClass() -> void {
|
||||
label_.get_style_context()->add_class(layout_.short_name);
|
||||
spdlog::debug("hyprland language add new short_name css class {}", layout_.short_name);
|
||||
}
|
||||
|
||||
auto Language::getLayout(const std::string& fullName) -> Layout {
|
||||
auto* const context = rxkb_context_new(RXKB_CONTEXT_LOAD_EXOTIC_RULES);
|
||||
rxkb_context_parse_default_ruleset(context);
|
||||
|
||||
Reference in New Issue
Block a user