fix: add a bool icon for the conditions.

ArchiDog1998 · Oct 24, 2023 · 8eb4d29 · 8eb4d29
1 parent bbfec02
commit 8eb4d29
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 7 deletions.
diff --git a/RotationSolver/Localization/Localization.json b/RotationSolver/Localization/Localization.json
@@ -560,7 +560,10 @@
   "ConfigWindow_Auto_MoveForwardConditionSet": "Move Forward Forced Condition",
   "ConfigWindow_Auto_MoveBackConditionSet": "Move Back Forced Condition",
   "ConfigWindow_Auto_AntiKnockbackConditionSet": "Anti Knockback Forced Condition",
-  "ConfigWindow_Auto_BurstConditionSet": "Burst Forced Condition",
   "ConfigWindow_Auto_SpeedConditionSet": "Speed Forced Condition",
-  "ConfigWindow_ConditionSetDesc": "The Condition set you chose, click to modify."
+  "ConfigWindow_ConditionSetDesc": "The Condition set you chose, click to modify.",
+  "ConfigWindow_Basic_UseAdditionalConditions": "Use additional conditions",
+  "ConfigWindow_Basic_SwitchCancelConditionSet": "Auto turn off conditions",
+  "ConfigWindow_Basic_SwitchManualConditionSet": "Auto turn manual conditions",
+  "ConfigWindow_Basic_SwitchAutoConditionSet": "Auto turn auto conditions"
 }
diff --git a/RotationSolver/UI/RotationConfigWindow_Config.cs b/RotationSolver/UI/RotationConfigWindow_Config.cs
@@ -267,7 +267,6 @@ private static void DrawBasicTimer()
     };
     private static void DrawBasicAutoSwitch()
     {
-
         foreach (var searchable in _basicSwitchTurnOff)
         {
             searchable?.Draw(Job);
@@ -280,8 +279,6 @@ private static void DrawBasicAutoSwitch()
             searchable?.Draw(Job);
         }
 
-        ImGui.Separator();
-
         _autoSwitch?.Draw();
     }
 

diff --git a/RotationSolver/UI/SearchableConfigs/CheckBoxSearch.cs b/RotationSolver/UI/SearchableConfigs/CheckBoxSearch.cs
@@ -135,6 +135,16 @@ public override void ResetToDefault(Job job)
     {
         Service.Config.SetBoolRaw(_config, Service.Config.GetBoolRawDefault(_config));
     }
+
+    protected override void DrawMiddle()
+    {
+        if (Service.Config.GetValue(PluginConfigBool.UseAdditionalConditions))
+        {
+            ConditionDrawer.DrawCondition(Service.Config.GetValue(_config));
+            ImGui.SameLine();
+        }
+        base.DrawMiddle();
+    }
 }
 
 internal abstract class CheckBoxSearch : Searchable
@@ -177,9 +187,14 @@ protected virtual void DrawChildren(Job job)
         }
     }
 
+    protected virtual void DrawMiddle()
+    {
+
+    }
+
     protected override void DrawMain(Job job)
     {
-        var hasChild = Children != null && Children.Length > 0;
+        var hasChild = Children != null && Children.Any(c => c.ShowInChild);
         var hasAdditional = AdditionalDraw != null;
         var hasSub = hasChild || hasAdditional;
         IDalamudTextureWrap texture = null;
@@ -214,6 +229,7 @@ protected override void DrawMain(Job job)
             if (enable || AlwaysShowChildren)
             {
                 var x = ImGui.GetCursorPosX();
+                DrawMiddle();
                 var drawBody = ImGui.TreeNode(name);
                 if (ImGui.IsItemHovered()) ShowTooltip(job);
 

diff --git a/RotationSolver/UI/SearchableConfigs/Searchable.cs b/RotationSolver/UI/SearchableConfigs/Searchable.cs
@@ -109,7 +109,7 @@ protected void ShowTooltip(Job job, bool showHand = true)
                 }
                 var wholeWidth = ImGui.GetWindowWidth();
 
-                if(Tooltips != null) foreach (var tooltip in Tooltips)
+                if (Tooltips != null) foreach (var tooltip in Tooltips)
                 {
                     RotationConfigWindow.DrawLinkDescription(tooltip, wholeWidth, false);
                 }