Fix color corruption on Allied Society tab

diff --git a/Directory.Build.targets b/Directory.Build.targets
index 58f58a736064463222406ce788d744712727d3de..6759af62cbb905cce22f532bb5a10b0aa8a3de88 100644 (file)
--- a/Directory.Build.targets
+++ b/Directory.Build.targets
@@ -1,5 +1,5 @@
 <Project>
     <PropertyGroup>
-        <Version>4.7</Version>
+        <Version>4.8</Version>
     </PropertyGroup>
 </Project>

diff --git a/Questionable/Windows/JournalComponents/AlliedSocietyJournalComponent.cs b/Questionable/Windows/JournalComponents/AlliedSocietyJournalComponent.cs
index 92cc96b7d461dbe7bad4b9e514ecbc29bd89c5e2..c7e506029336e4cc0d18858cda35325ecc04750f 100644 (file)
--- a/Questionable/Windows/JournalComponents/AlliedSocietyJournalComponent.cs
+++ b/Questionable/Windows/JournalComponents/AlliedSocietyJournalComponent.cs
@@ -57,16 +57,28 @@ internal sealed class AlliedSocietyJournalComponent
             if (quests.Count == 0)
                 continue;
 
-            bool containsNewQuests = quests.Any(x => !_questFunctions.IsQuestComplete(x.QuestId));
-            if (containsNewQuests)
-                ImGui.PushStyleColor(ImGuiCol.Text, ImGuiColors.DalamudYellow);
+            string label = $"{alliedSociety}###AlliedSociety{(int)alliedSociety}";
+#if DEBUG
+            bool isOpen;
+            if (quests.Any(x => !_questRegistry.IsKnownQuest(x.QuestId)))
+            {
+                using (ImRaii.PushColor(ImGuiCol.Text, ImGuiColors.DalamudOrange))
+                    isOpen = ImGui.CollapsingHeader(label);
+            }
+            else if (quests.Any(x => !_questFunctions.IsQuestComplete(x.QuestId)))
+            {
+                using (ImRaii.PushColor(ImGuiCol.Text, ImGuiColors.DalamudYellow))
+                    isOpen = ImGui.CollapsingHeader(label);
+            }
+            else
+                isOpen = ImGui.CollapsingHeader(label);
+#else
+            bool isOpen = ImGui.CollapsingHeader(label);
+#endif
 
-            if (!ImGui.CollapsingHeader($"{alliedSociety}###AlliedSociety{(int)alliedSociety}"))
+            if (!isOpen)
                 continue;
 
-            if (containsNewQuests)
-                ImGui.PopStyleColor();
-
             if (alliedSociety <= EAlliedSociety.Ixal)
             {
                 for (byte i = 1; i <= 8; ++i)