fix: fixed some showing up.

ArchiDog1998 · Mar 16, 2023 · bb8f8f7 · bb8f8f7
1 parent ad4d9ed
commit bb8f8f7
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 9 deletions.
diff --git a/RotationSolver/RotationHelper.cs b/RotationSolver/RotationHelper.cs
@@ -1,5 +1,7 @@
-using RotationSolver.Basic.Rotations;
+using Dalamud.Interface.Colors;
+using RotationSolver.Basic.Rotations;
 using System.Diagnostics;
+using System.Numerics;
 
 namespace RotationSolver;
 
@@ -20,6 +22,9 @@ public static bool IsAllowed(this ICustomRotation rotation, out string name)
         return _allowedAssembly.Contains(rotation.GetType().Assembly.GetName().Name);
     }
 
+    public static Vector4 GetColor(this ICustomRotation rotation)
+   => rotation.IsAllowed(out _) ? ImGuiColors.DalamudWhite : ImGuiColors.DalamudViolet;
+
     public static string GetAuthor(this ICustomRotation rotation)
     {
         return FileVersionInfo.GetVersionInfo(rotation.GetType().Assembly.Location)?.CompanyName ?? "Unnamed";

diff --git a/RotationSolver/UI/ImGuiHelper.cs b/RotationSolver/UI/ImGuiHelper.cs
@@ -421,6 +421,7 @@ public unsafe static void Display(this ICustomRotation rotation, ICustomRotation
                 {
                     foreach (var r in rotations)
                     {
+                        ImGui.PushStyleColor(ImGuiCol.Text, r.GetColor());
                         if (ImGui.Selectable(r.RotationName))
                         {
                             Service.Config.RotationChoices[rotation.Job.RowId] = r.RotationName;
@@ -430,6 +431,7 @@ public unsafe static void Display(this ICustomRotation rotation, ICustomRotation
                         {
                             showToolTip?.Invoke(r.Description);
                         }
+                        ImGui.PopStyleColor();
                     }
                     ImGui.EndCombo();
                 }
@@ -441,18 +443,14 @@ public unsafe static void Display(this ICustomRotation rotation, ICustomRotation
             ImGui.SameLine();
 
             var isAllowed = rotation.IsAllowed(out _);
-            ImGui.TextColored(isAllowed ? ImGuiColors.DalamudWhite : ImGuiColors.DalamudViolet,
+            ImGui.TextColored(rotation.GetColor(),
                 rotation.GetAuthor());
             if (!isAllowed)
             {
-                var allHighEnds = string.Join('\n', SocialUpdater.HighEndDuties.Select(x => x.PlaceName?.Value?.Name.ToString())
-                .Where(s => !string.IsNullOrEmpty(s)));
+                var showStr = "This rotation is not allowed to be used in High-end Duty!"
+                + string.Join("", SocialUpdater.HighEndDuties.Select(x => x.PlaceName?.Value?.Name.ToString())
+                .Where(s => !string.IsNullOrEmpty(s)).Select(t => "\n - " + t));
 
-                var showStr = "This rotation is not allowed to be used in High-end Duty!";
-                if(!string.IsNullOrEmpty(allHighEnds))
-                {
-                    showStr += "\n" + allHighEnds;
-                }
                 HoveredString(showStr);
             }