From be6eaa0f24d20a9f6ea71ece1b744da1b138f0fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=A7=8B=E6=B0=B4?= <53346444+ArchiDog1998@users.noreply.github.com> Date: Mon, 19 Feb 2024 20:00:18 +0800 Subject: [PATCH] fix: better icon. --- ActionTimelineEx/Helpers/DrawHelper.cs | 2 +- ActionTimelineEx/Timeline/TimelineItem.cs | 6 +++--- ActionTimelineEx/Timeline/TimelineManager.cs | 2 +- ECommons | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/ActionTimelineEx/Helpers/DrawHelper.cs b/ActionTimelineEx/Helpers/DrawHelper.cs index 53d8f27..db9366c 100644 --- a/ActionTimelineEx/Helpers/DrawHelper.cs +++ b/ActionTimelineEx/Helpers/DrawHelper.cs @@ -65,7 +65,7 @@ public static Vector4 ChangeAlpha(this Vector4 color, float alpha) return color; } - public static IDalamudTextureWrap? GetTextureFromIconId(uint iconId, bool highQuality = false) + public static IDalamudTextureWrap? GetTextureFromIconId(uint iconId, bool highQuality = true) => ThreadLoadImageHandler.TryGetIconTextureWrap(iconId, highQuality, out var texture) ? texture : ThreadLoadImageHandler.TryGetIconTextureWrap(0, highQuality, out texture) ? texture : null; diff --git a/ActionTimelineEx/Timeline/TimelineItem.cs b/ActionTimelineEx/Timeline/TimelineItem.cs index a3db8a1..ba717ff 100644 --- a/ActionTimelineEx/Timeline/TimelineItem.cs +++ b/ActionTimelineEx/Timeline/TimelineItem.cs @@ -76,11 +76,11 @@ public void DrawItemWithCenter(Vector2 centerPos, TimelineLayer icon, DrawingSet private static (IDalamudTextureWrap texture, string? name)[] GetTextures(HashSet<(uint icon, string? name)> iconIds) { var result = new List<(IDalamudTextureWrap texture, string? name)>(iconIds.Count); - foreach (var item in iconIds) + foreach (var (icon, name) in iconIds) { - IDalamudTextureWrap? texture = DrawHelper.GetTextureFromIconId(item.icon); + IDalamudTextureWrap? texture = DrawHelper.GetTextureFromIconId(icon); if (texture == null) continue; - result.Add((texture, item.name)); + result.Add((texture, name)); } return result.ToArray(); } diff --git a/ActionTimelineEx/Timeline/TimelineManager.cs b/ActionTimelineEx/Timeline/TimelineManager.cs index c588cf7..57fae09 100644 --- a/ActionTimelineEx/Timeline/TimelineManager.cs +++ b/ActionTimelineEx/Timeline/TimelineManager.cs @@ -308,7 +308,7 @@ private void ActionFromSelf(ActionEffectSet set) if (effectItem == null) return; - effectItem.IsHq = set.Header.ActionType == ActionType.Item && set.Header.ActionID > 1000000; + effectItem.IsHq = set.Header.ActionType != ActionType.Item || set.Header.ActionID > 1000000; foreach (var i in statusGain) { diff --git a/ECommons b/ECommons index c0bf9b4..64b3803 160000 --- a/ECommons +++ b/ECommons @@ -1 +1 @@ -Subproject commit c0bf9b456b27dfdc08d9dbdaa70f7f788fe91c28 +Subproject commit 64b38039faf2a044fd1fc4829a567e123e4ca167