From c9215ad818123206600f619ff89519dfd3bb7098 Mon Sep 17 00:00:00 2001
From: Pol Rivero <65060696+pol-rivero@users.noreply.github.com>
Date: Fri, 2 May 2025 14:29:27 +0200
Subject: [PATCH] Minor code cleanup

---
 src/modules/hyprland/workspace.cpp  |  9 +++------
 src/modules/hyprland/workspaces.cpp | 14 +++-----------
 2 files changed, 6 insertions(+), 17 deletions(-)

diff --git a/src/modules/hyprland/workspace.cpp b/src/modules/hyprland/workspace.cpp
index 3350e302..30496069 100644
--- a/src/modules/hyprland/workspace.cpp
+++ b/src/modules/hyprland/workspace.cpp
@@ -105,11 +105,7 @@ void Workspace::initializeWindowMap(const Json::Value &clients_data) {
 
 void Workspace::setActiveWindow(WindowAddress const &addr) {
   for (auto &window : m_windowMap) {
-    if (window.address == addr) {
-      window.setActive(true);
-    } else {
-      window.setActive(false);
-    }
+    window.setActive(window.address == addr);
   }
 }
 
@@ -244,6 +240,7 @@ void Workspace::update(const std::string &workspace_icon) {
   m_labelBefore.set_markup(fmt::format(fmt::runtime(formatBefore), fmt::arg("id", id()),
                                        fmt::arg("name", name()), fmt::arg("icon", workspace_icon),
                                        fmt::arg("windows", windows)));
+  m_labelBefore.get_style_context()->add_class("workspace-label");
 
   if (m_workspaceManager.enableTaskbar()) {
     updateTaskbar(workspace_icon);
@@ -261,7 +258,7 @@ void Workspace::updateTaskbar(const std::string &workspace_icon) {
   for (const auto &window_repr : m_windowMap) {
     if (isFirst) {
       isFirst = false;
-    } else {
+    } else if (m_workspaceManager.getWindowSeparator() != "") {
       auto windowSeparator = Gtk::make_managed<Gtk::Label>(m_workspaceManager.getWindowSeparator());
       m_content.pack_start(*windowSeparator, false, false);
       windowSeparator->show();
diff --git a/src/modules/hyprland/workspaces.cpp b/src/modules/hyprland/workspaces.cpp
index 752f298c..8c99e706 100644
--- a/src/modules/hyprland/workspaces.cpp
+++ b/src/modules/hyprland/workspaces.cpp
@@ -595,21 +595,13 @@ void Workspaces::onActiveWindowChanged(WindowAddress const &activeWindowAddress)
   m_currentActiveWindowAddress = activeWindowAddress;
 
   for (auto &[address, window] : m_orphanWindowMap) {
-    if (address == activeWindowAddress) {
-      window.setActive(true);
-    } else {
-      window.setActive(false);
-    }
+    window.setActive(address == activeWindowAddress);
   }
   for (auto const &workspace : m_workspaces) {
     workspace->setActiveWindow(activeWindowAddress);
   }
   for (auto &window : m_windowsToCreate) {
-    if (window.getAddress() == activeWindowAddress) {
-      window.setActive(true);
-    } else {
-      window.setActive(false);
-    }
+    window.setActive(window.getAddress() == activeWindowAddress);
   }
 }
 
@@ -953,7 +945,7 @@ auto Workspaces::update() -> void {
 
 void Workspaces::updateWindowCount() {
   const Json::Value workspacesJson = m_ipc.getSocket1JsonReply("workspaces");
-  for (auto &workspace : m_workspaces) {
+  for (auto const &workspace : m_workspaces) {
     auto workspaceJson = std::ranges::find_if(workspacesJson, [&](Json::Value const &x) {
       return x["name"].asString() == workspace->name() ||
              (workspace->isSpecial() && x["name"].asString() == "special:" + workspace->name());