From a36a5e89a9871773b24dba9e51ac056877a7902a Mon Sep 17 00:00:00 2001
From: dimti <demidov@dimti.ru>
Date: Fri, 10 Oct 2025 11:57:44 +0300
Subject: [PATCH] Approach to dry pattern - separate remove/add css-classes
 logic to methods

---
 include/modules/hyprland/language.hpp |  4 +++-
 src/modules/hyprland/language.cpp     | 21 +++++++++++++--------
 2 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/include/modules/hyprland/language.hpp b/include/modules/hyprland/language.hpp
index d1469f60..199356c1 100644
--- a/include/modules/hyprland/language.hpp
+++ b/include/modules/hyprland/language.hpp
@@ -30,7 +30,9 @@ class Language : public waybar::ALabel, public EventHandler {
     std::string short_description;
   };
 
-  auto getLayout(const std::string&) -> Layout;
+  auto removeXkbLayoutCssClass() -> void;
+  auto addXkbLayoutCssClass() -> void;
+  static auto getLayout(const std::string&) -> Layout;
 
   std::mutex mutex_;
   const Bar& bar_;
diff --git a/src/modules/hyprland/language.cpp b/src/modules/hyprland/language.cpp
index 3dd5aef7..33e56720 100644
--- a/src/modules/hyprland/language.cpp
+++ b/src/modules/hyprland/language.cpp
@@ -82,11 +82,9 @@ void Language::onEvent(const std::string& ev) {
 
   layoutName = waybar::util::sanitize_string(layoutName);
 
-  label_.get_style_context()->remove_class(layout_.short_name);
-  spdlog::debug("hyprland language try to remove currently short_name css class {}", layout_.short_name);
+  removeXkbLayoutCssClass();
   layout_ = getLayout(layoutName);
-  label_.get_style_context()->add_class(layout_.short_name);
-  spdlog::debug("hyprland language add new short_name css class {}", layout_.short_name);
+  addXkbLayoutCssClass();
 
   spdlog::debug("hyprland language onevent with {}", layoutName);
 
@@ -107,11 +105,9 @@ void Language::initLanguage() {
 
     searcher = waybar::util::sanitize_string(searcher);
 
-    label_.get_style_context()->remove_class(layout_.short_name);
-    spdlog::debug("hyprland language try to remove currently short_name css class {}", layout_.short_name);
+    removeXkbLayoutCssClass();
     layout_ = getLayout(searcher);
-    label_.get_style_context()->add_class(layout_.short_name);
-    spdlog::debug("hyprland language add new short_name css class {}", layout_.short_name);
+    addXkbLayoutCssClass();
 
     spdlog::debug("hyprland language initLanguage found {}", layout_.full_name);
 
@@ -121,6 +117,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);