fix: fixed multi-monitor bugs.

ArchiDog1998 · Aug 22, 2023 · 8f1b91b · 8f1b91b
1 parent f0dfa9b
commit 8f1b91b
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 30 deletions.
diff --git a/Resources/RotationSolverRecord.json b/Resources/RotationSolverRecord.json
@@ -1,3 +1,3 @@
 {
-  "ClickingCount": 1468
+  "ClickingCount": 3526
 }
diff --git a/RotationSolver.Basic/Helpers/ObjectHelper.cs b/RotationSolver.Basic/Helpers/ObjectHelper.cs
@@ -230,32 +230,6 @@ internal static EnemyPositional FindEnemyPositional(this GameObject enemy)
         return EnemyPositional.Flank;
     }
 
-    //internal static uint GetHealthFromMulty(float mult)
-    //{
-    //    if (!Player.Available) return 0;
-
-    //    var role = Service.GetSheet<ClassJob>().GetRow(
-    //            Player.Object.ClassJob.Id).GetJobRole();
-    //    float multi = mult * role switch
-    //    {
-    //        JobRole.Tank => 1,
-    //        JobRole.Healer => 1.6f,
-    //        _ => 1.5f,
-    //    };
-
-    //    var partyCount = DataCenter.PartyMembers.Count();
-    //    if (partyCount > 4)
-    //    {
-    //        multi *= 6.4f;
-    //    }
-    //    else if (partyCount > 1)
-    //    {
-    //        multi *= 3.5f;
-    //    }
-
-    //    return (uint)(multi * Player.Object.MaxHp);
-    //}
-
     /// <summary>
     /// The distance from <paramref name="obj"/> to the player
     /// </summary>

diff --git a/RotationSolver/Localization/Localization.json b/RotationSolver/Localization/Localization.json
@@ -240,12 +240,12 @@
   "SpecialCommandType_Burst": "Burst",
   "SpecialCommandType_EndSpecial": "End Special",
   "SpecialCommandType_Speed": "Speed",
-  "SpecialCommandType_Smart": "Auto Target ",
+  "SpecialCommandType_Smart": "Auto Target",
   "SpecialCommandType_Manual": "Manual Target",
   "SpecialCommandType_Cancel": "Cancel",
   "SpecialCommandType_Off": "Off",
   "ActionConditionType_Elapsed": "Elapsed",
-  "ActionConditionType_ElapsedGCD": "ElapsedG CD ",
+  "ActionConditionType_ElapsedGCD": "Elapsed GCD",
   "ActionConditionType_Remain": "Remain Time",
   "ActionConditionType_RemainGCD": "Remain GCD",
   "ActionConditionType_ShouldUse": "Can Use",

diff --git a/RotationSolver/UI/RotationConfigWindow.cs b/RotationSolver/UI/RotationConfigWindow.cs
@@ -76,7 +76,8 @@ public override void Draw()
             var leftTop = ImGui.GetWindowPos() + ImGui.GetCursorPos();
             var rightDown = leftTop + ImGui.GetWindowSize();
             var screenSize = ImGuiHelpers.MainViewport.Size;
-            if (leftTop.X <= 0 || leftTop.Y <= 0 || rightDown.X >= screenSize.X || rightDown.Y >= screenSize.Y)
+            if ((leftTop.X <= 0 || leftTop.Y <= 0 || rightDown.X >= screenSize.X || rightDown.Y >= screenSize.Y)
+                && !ImGui.GetIO().ConfigFlags.HasFlag(ImGuiConfigFlags.ViewportsEnable))
             {
                 var str = string.Empty;
                 for (int i = 0; i < 150; i++)