diff --git a/ActionTimelineEx/Configurations/Actions/GCDAction.cs b/ActionTimelineEx/Configurations/Actions/GCDAction.cs index 4b07773..9d94a83 100644 --- a/ActionTimelineEx/Configurations/Actions/GCDAction.cs +++ b/ActionTimelineEx/Configurations/Actions/GCDAction.cs @@ -43,7 +43,7 @@ public float Draw(ImDrawListPtr drawList, Vector2 point, bool pass, ActionSettin if (Plugin.Settings.DrawTime) { var width = ImGui.CalcTextSize(time.GetString()).X + 5; - drawList.AddText(point, uint.MaxValue, time.GetString()); + drawList.AddText(point, uint.MaxValue, time.GetString() + " "); point += Vector2.UnitX * width; time += TimeSpan.FromSeconds(Gcd); } diff --git a/ActionTimelineEx/Configurations/RotationSetting.cs b/ActionTimelineEx/Configurations/RotationSetting.cs index e16661f..cdb3150 100644 --- a/ActionTimelineEx/Configurations/RotationSetting.cs +++ b/ActionTimelineEx/Configurations/RotationSetting.cs @@ -62,6 +62,8 @@ public void Draw(float heightReduce) var nextAction = RotationHelper.ActiveAction; TimeSpan span = TimeSpan.Zero; + bool isNotFirst = false; + for (var i = 0; i < GCDs.Count; i++) { var item = GCDs[i]; @@ -72,7 +74,7 @@ public void Draw(float heightReduce) continue; } - if (Plugin.Settings.VerticalDraw && i != 0) + if (Plugin.Settings.VerticalDraw && isNotFirst) { pos.X = minPosX; @@ -86,6 +88,8 @@ public void Draw(float heightReduce) } } + isNotFirst = true; + var width = item.Draw(drawList, pos, i < RotationHelper.GcdUsedCount, nextAction, ref span); pos += new Vector2(width + spacing, 0); diff --git a/ActionTimelineEx/Configurations/Settings.cs b/ActionTimelineEx/Configurations/Settings.cs index 47f490f..c8cd309 100644 --- a/ActionTimelineEx/Configurations/Settings.cs +++ b/ActionTimelineEx/Configurations/Settings.cs @@ -90,7 +90,7 @@ public class Settings : IPluginConfiguration [UI("Reverse Draw", Parent = nameof(VerticalDraw))] public bool Reverse { get; set; } = false; - [UI("Draw Time", Parent = nameof(VerticalDraw))] + [UI("Draw Time", Parent = nameof(DrawRotation))] public bool DrawTime { get; set; } = false; [UI("Ignore Items", Parent = nameof(DrawRotation))] diff --git a/ActionTimelineEx/Localization/Localization.json b/ActionTimelineEx/Localization/Localization.json index 72de8ae..94de313 100644 --- a/ActionTimelineEx/Localization/Localization.json +++ b/ActionTimelineEx/Localization/Localization.json @@ -160,9 +160,10 @@ "ActionTimelineEx.Configurations.Actions.ActionSettingType.Item": "Item", "ActionTimelineEx.Configurations.Actions.oGCDActionDescription": "Inner Release (oGCD)", "ActionTimelineEx.Configurations.Actions.ActionSetting": "ActionSetting", - "ActionTimelineEx.Configurations.Actions.ActionSettingDescription": "Heavy Swing (GCD)", + "ActionTimelineEx.Configurations.Actions.ActionSettingDescription": "Rage of Halone (GCD)", "ActionTimelineEx.Configurations.Actions.ActionSettingName.ActionID": "Action ID", "ActionTimelineEx.Configurations.Actions.GCDActionName.RecastOverride": "Recast override time", "ActionTimelineEx.Configurations.SettingsName.GcdTime": "Gcd Time", - "ActionTimelineEx.Configurations.Actions.GCDActionName.GcdOverride": "Recast time override" + "ActionTimelineEx.Configurations.Actions.GCDActionName.GcdOverride": "Recast time override", + "ActionTimelineEx.Configurations.SettingsName.DrawTime": "Draw Time" } \ No newline at end of file diff --git a/ECommons b/ECommons index 9505f74..4967d90 160000 --- a/ECommons +++ b/ECommons @@ -1 +1 @@ -Subproject commit 9505f7456f837bb3a67735395b5ee58197575b4d +Subproject commit 4967d90bf5d08787e19b870cb65f167337d0ebfc