From 61c5dad895ce484c5823ac07edfec8b700930f0d Mon Sep 17 00:00:00 2001
From: Pol Rivero <65060696+pol-rivero@users.noreply.github.com>
Date: Thu, 1 May 2025 21:03:46 +0200
Subject: [PATCH] Fix some windows not being marked as active when opened

In some cases, the active event is arriving before the create event. We need to store the currently active address and initialize the windows accordingly
---
 include/modules/hyprland/windowcreationpayload.hpp | 2 +-
 include/modules/hyprland/workspaces.hpp            | 1 +
 src/modules/hyprland/windowcreationpayload.cpp     | 5 +++--
 src/modules/hyprland/workspaces.cpp                | 4 +++-
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/include/modules/hyprland/windowcreationpayload.hpp b/include/modules/hyprland/windowcreationpayload.hpp
index 50b709f8..98526348 100644
--- a/include/modules/hyprland/windowcreationpayload.hpp
+++ b/include/modules/hyprland/windowcreationpayload.hpp
@@ -43,7 +43,7 @@ class WindowCreationPayload {
   WindowCreationPayload(std::string workspace_name, WindowAddress window_address,
                         WindowRepr window_repr);
   WindowCreationPayload(std::string workspace_name, WindowAddress window_address,
-                        std::string window_class, std::string window_title);
+                        std::string window_class, std::string window_title, bool is_active);
   WindowCreationPayload(Json::Value const& client_data);
 
   int incrementTimeSpentUncreated();
diff --git a/include/modules/hyprland/workspaces.hpp b/include/modules/hyprland/workspaces.hpp
index 02599dd5..240047e5 100644
--- a/include/modules/hyprland/workspaces.hpp
+++ b/include/modules/hyprland/workspaces.hpp
@@ -179,6 +179,7 @@ class Workspaces : public AModule, public EventHandler {
   int m_taskbarIconSize = 16;
   Gtk::Orientation m_taskbarOrientation = Gtk::ORIENTATION_HORIZONTAL;
   std::string m_onClickWindow;
+  std::string m_currentActiveWindowAddress;
 
   std::vector<std::regex> m_ignoreWorkspaces;
 
diff --git a/src/modules/hyprland/windowcreationpayload.cpp b/src/modules/hyprland/windowcreationpayload.cpp
index 0cdf4a1a..48c4047f 100644
--- a/src/modules/hyprland/windowcreationpayload.cpp
+++ b/src/modules/hyprland/windowcreationpayload.cpp
@@ -30,10 +30,11 @@ WindowCreationPayload::WindowCreationPayload(std::string workspace_name,
 
 WindowCreationPayload::WindowCreationPayload(std::string workspace_name,
                                              WindowAddress window_address, std::string window_class,
-                                             std::string window_title)
+                                             std::string window_title, bool is_active)
     : m_window(std::make_pair(std::move(window_class), std::move(window_title))),
       m_windowAddress(std::move(window_address)),
-      m_workspaceName(std::move(workspace_name)) {
+      m_workspaceName(std::move(workspace_name)),
+      m_isActive(is_active) {
   clearAddr();
   clearWorkspaceName();
 }
diff --git a/src/modules/hyprland/workspaces.cpp b/src/modules/hyprland/workspaces.cpp
index e6295607..752f298c 100644
--- a/src/modules/hyprland/workspaces.cpp
+++ b/src/modules/hyprland/workspaces.cpp
@@ -492,7 +492,8 @@ void Workspaces::onWindowOpened(std::string const &payload) {
 
   std::string windowTitle = payload.substr(nextCommaIdx + 1, payload.length() - nextCommaIdx);
 
-  m_windowsToCreate.emplace_back(workspaceName, windowAddress, windowClass, windowTitle);
+  bool isActive = m_currentActiveWindowAddress == windowAddress;
+  m_windowsToCreate.emplace_back(workspaceName, windowAddress, windowClass, windowTitle, isActive);
 }
 
 void Workspaces::onWindowClosed(std::string const &addr) {
@@ -591,6 +592,7 @@ void Workspaces::onWindowTitleEvent(std::string const &payload) {
 
 void Workspaces::onActiveWindowChanged(WindowAddress const &activeWindowAddress) {
   spdlog::trace("Active window changed: {}", activeWindowAddress);
+  m_currentActiveWindowAddress = activeWindowAddress;
 
   for (auto &[address, window] : m_orphanWindowMap) {
     if (address == activeWindowAddress) {