fix: action sequencer changing.

ArchiDog1998 · Aug 15, 2023 · 21023ba · 21023ba
1 parent 3436d92
commit 21023ba
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 35 deletions.
diff --git a/RotationSolver/ActionSequencer/ConditionSet.cs b/RotationSolver/ActionSequencer/ConditionSet.cs
@@ -10,40 +10,39 @@ public bool IsTrue(ICustomRotation combo) => Conditions.Count != 0 && (IsAnd ? C
     public List<ICondition> Conditions { get; set; } = new List<ICondition>();
     public bool IsAnd { get; set; }
 
-    [JsonIgnore]
-    public float Height => Conditions.Sum(c => c is ConditionSet ? c.Height + 10 : c.Height) + ICondition.DefaultHeight + 12;
-
     public void Draw(ICustomRotation combo)
     {
-        if (ImGui.BeginChild("ConditionSet" + GetHashCode().ToString(), new Vector2(-1f, Height), true))
-        {
-            AddButton();
+        var start = ImGui.GetCursorPos();
+        ImGui.BeginGroup();
 
-            ImGui.SameLine();
+        AddButton();
 
-            ImGuiHelper.DrawCondition(IsTrue(combo));
+        ImGui.SameLine();
 
-            ImGui.SameLine();
-            ImGui.SetNextItemWidth(65);
-            int isAnd = IsAnd ? 1 : 0;
-            if (ImGui.Combo($"##Rule" + GetHashCode().ToString(), ref isAnd, new string[]
-            {
-                "OR", "AND",
-            }, 2))
-            {
-                IsAnd = isAnd != 0;
-            }
+        ImGuiHelper.DrawCondition(IsTrue(combo));
 
-            ImGui.Separator();
+        ImGui.SameLine();
+        ImGui.SetNextItemWidth(65);
+        int isAnd = IsAnd ? 1 : 0;
+        if (ImGui.Combo($"##Rule" + GetHashCode().ToString(), ref isAnd, new string[]
+        {
+                "OR", "AND",
+        }, 2))
+        {
+            IsAnd = isAnd != 0;
+        }
 
-            var relay = Conditions;
-            if (ImGuiHelper.DrawEditorList(relay, i => i.Draw(combo)))
-            {
-                Conditions = relay;
-            }
+        ImGui.Separator();
 
-            ImGui.EndChild();
+        var relay = Conditions;
+        if (ImGuiHelper.DrawEditorList(relay, i => i.Draw(combo)))
+        {
+            Conditions = relay;
         }
+
+        ImGui.EndGroup();
+
+        ControlWindow.HighLight(ImGui.GetWindowPos() + start, ImGui.GetItemRectSize());
     }
 
     private void AddButton()

diff --git a/RotationSolver/ActionSequencer/ICondition.cs b/RotationSolver/ActionSequencer/ICondition.cs
@@ -2,8 +2,6 @@
 
 internal interface ICondition
 {
-    const float DefaultHeight = 33;
     bool IsTrue(ICustomRotation rotation);
     void Draw(ICustomRotation rotation);
-    float Height { get; }
 }
diff --git a/RotationSolver/ActionSequencer/RotationCondition.cs b/RotationSolver/ActionSequencer/RotationCondition.cs
@@ -109,10 +109,6 @@ public bool IsTrue(ICustomRotation rotation)
         return false;
     }
 
-
-    [JsonIgnore]
-    public float Height => ICondition.DefaultHeight;
-
     string searchTxt = string.Empty;
     public void Draw(ICustomRotation rotation)
     {

diff --git a/RotationSolver/ActionSequencer/TargetCondition.cs b/RotationSolver/ActionSequencer/TargetCondition.cs
@@ -108,9 +108,6 @@ public bool IsTrue(ICustomRotation combo)
         return Condition ? !result : result;
     }
 
-    [JsonIgnore]
-    public float Height => ICondition.DefaultHeight;
-
     string searchTxt = string.Empty;
     public void Draw(ICustomRotation combo)
     {

diff --git a/RotationSolver/UI/ControlWindow.cs b/RotationSolver/UI/ControlWindow.cs
@@ -251,7 +251,7 @@ static void DrawCommandAction(IAction gcd, IAction ability, SpecialCommandType c
         ImGui.EndGroup();
     }
 
-    static void HighLight(Vector2 pt, Vector2 size, float thickness = 2f)
+    public static void HighLight(Vector2 pt, Vector2 size, float thickness = 2f)
     {
         var offset = ImGui.GetStyle().ItemSpacing / 2;
         ImGui.GetWindowDrawList().AddRect(pt - offset, pt + size + offset,