From b4ca4b4a7137a4fad9ca610f51f58e2bcc6a75b3 Mon Sep 17 00:00:00 2001
From: aemony <aemony@aemony.se>
Date: Wed, 21 Feb 2024 23:40:52 +0100
Subject: [PATCH] Fixed expand/collapse category states

---
 src/tabs/library.cpp | 24 ++++++++++++++++--------
 1 file changed, 16 insertions(+), 8 deletions(-)

diff --git a/src/tabs/library.cpp b/src/tabs/library.cpp
index 1a231699..205ad926 100644
--- a/src/tabs/library.cpp
+++ b/src/tabs/library.cpp
@@ -6176,6 +6176,7 @@ SKIF_UI_Tab_DrawLibrary (void)
   // TODO: Pinned on top has some large counting issues, e.g. disabling a platform or hiding games allows the user to bypass the 5 limit restriction
 
   static int  apply_header_state = 0;
+  bool        new_header_state   = false;
 
   // Populate the list of games with all recognized games
   for (auto& app : g_apps)
@@ -6298,9 +6299,7 @@ SKIF_UI_Tab_DrawLibrary (void)
           if (ImGui::Selectable (SKIF_Util_FormatStringRaw ("Expand all###PopupExpand-%i", categories)))
           {
             apply_header_state = ImGui::GetFrameCount ( );
-
-            for (auto& category : _registry.vecCategories)
-              category.expanded = true;
+            new_header_state = true;
 
             ImGui::CloseCurrentPopup ( );
           }
@@ -6308,9 +6307,7 @@ SKIF_UI_Tab_DrawLibrary (void)
           if (ImGui::Selectable (SKIF_Util_FormatStringRaw ("Collapse all###PopupCollapse-%i", categories)))
           {
             apply_header_state = ImGui::GetFrameCount ( );
-
-            for (auto& category : _registry.vecCategories)
-              category.expanded = false;
+            new_header_state = false;
 
             ImGui::CloseCurrentPopup ( );
           }
@@ -6607,8 +6604,19 @@ SKIF_UI_Tab_DrawLibrary (void)
     }
   }
 
-  if (apply_header_state > 0 && ImGui::GetFrameCount ( ) > apply_header_state)
-    apply_header_state = 0;
+  if (apply_header_state > 0)
+  {
+    if (ImGui::GetFrameCount() == apply_header_state)
+    {
+      for (auto& category : _registry.vecCategories)
+        category.expanded = new_header_state;
+    }
+
+    else
+    {
+      apply_header_state = 0;
+    }
+  }
 
   if (resetNumOnTop)
     numPinnedOnTop = 0;