v1.0.7.0: Hotbar charge count on slots; fix WndProc restore on unload (left-click after disable)

Co-authored-by: Cursor <cursoragent@cursor.com>

HSUI.csproj

@@ -9,9 +9,9 @@
 
 	<PropertyGroup>
 		<AssemblyName>HSUI</AssemblyName>
-		<AssemblyVersion>1.0.5.0</AssemblyVersion>
+		<AssemblyVersion>1.0.7.0</AssemblyVersion>
-		<FileVersion>1.0.5.0</FileVersion>
+		<FileVersion>1.0.7.0</FileVersion>
-		<InformationalVersion>1.0.5.0</InformationalVersion>
+		<InformationalVersion>1.0.7.0</InformationalVersion>
 	</PropertyGroup>
 
 	<PropertyGroup>

HSUI.json

@@ -2,7 +2,7 @@
   "Author": "Knack117",
   "Name": "HSUI",
   "InternalName": "HSUI",
-  "AssemblyVersion": "1.0.5.0",
+  "AssemblyVersion": "1.0.7.0",
   "Description": "HSUI provides a highly configurable HUD replacement for FFXIV, recreated from DelvUI using KamiToolKit, FFXIVClientStructs, and Dalamud. Features unit frames, castbars, job gauges, nameplates, party frames, status effects, enemy list, configurable hotbars with drag-and-drop, and profiles.",
   "ApplicableVersion": "any",
   "RepoUrl": "https://github.com/Knack117/HSUI",

Helpers/ActionBarsManager.cs

@@ -50,8 +50,12 @@ namespace HSUI.Helpers
             public RaptureHotbarModule.HotbarSlotType SlotType { get; }
             /// <summary>Keybind hint from game (user's keybind settings). Empty if unavailable.</summary>
             public string KeybindHint { get; }
+            /// <summary>Current charges for charge-based actions; 0 when not applicable.</summary>
+            public int CurrentCharges { get; }
+            /// <summary>Max charges for charge-based actions; &gt;1 only for actions with charges.</summary>
+            public int MaxCharges { get; }
 
-            public SlotInfo(uint iconId, bool isEmpty, bool usable, int cooldownPct, int cooldownSecs, uint actionId = 0, RaptureHotbarModule.HotbarSlotType slotType = 0, string keybindHint = "")
+            public SlotInfo(uint iconId, bool isEmpty, bool usable, int cooldownPct, int cooldownSecs, uint actionId = 0, RaptureHotbarModule.HotbarSlotType slotType = 0, string keybindHint = "", int currentCharges = 0, int maxCharges = 0)
             {
                 IconId = iconId;
                 IsEmpty = isEmpty;
@@ -61,6 +65,8 @@ namespace HSUI.Helpers
                 ActionId = actionId;
                 SlotType = slotType;
                 KeybindHint = keybindHint ?? "";
+                CurrentCharges = currentCharges;
+                MaxCharges = maxCharges;
             }
         }
 
@@ -106,13 +112,13 @@ namespace HSUI.Helpers
 
                 if (slot == null)
                 {
-                    list.Add(new SlotInfo(0, true, false, 0, 0, 0, 0, keybind));
+                    list.Add(new SlotInfo(0, true, false, 0, 0, 0, 0, keybind, 0, 0));
                     continue;
                 }
 
                 if (slot->IsEmpty)
                 {
-                    list.Add(new SlotInfo(0, true, false, 0, 0, 0, 0, keybind));
+                    list.Add(new SlotInfo(0, true, false, 0, 0, 0, 0, keybind, 0, 0));
                     continue;
                 }
 
@@ -122,7 +128,8 @@ namespace HSUI.Helpers
                 var slotType = slot->ApparentSlotType;
 
                 (int pct, int secsLeft) = GetSlotCooldown(slot);
-                list.Add(new SlotInfo(iconId, false, usable, pct, secsLeft, actionId, slotType, keybind));
+                (int currentCharges, int maxCharges) = GetSlotCharges(slotType, actionId);
+                list.Add(new SlotInfo(iconId, false, usable, pct, secsLeft, actionId, slotType, keybind, currentCharges, maxCharges));
             }
 
             return list;
@@ -132,6 +139,27 @@ namespace HSUI.Helpers
         /// Gets cooldown for a hotbar slot. For Action/GeneralAction/PetAction, uses ActionManager recast API
         /// (more accurate for adjusted IDs, recast groups). Falls back to slot's GetSlotActionCooldownPercentage for Items/Macros.
         /// </summary>
+        /// <summary>
+        /// Gets current and max charges for a slot. Only applies to Action type; returns (0,0) otherwise.
+        /// </summary>
+        private static unsafe (int CurrentCharges, int MaxCharges) GetSlotCharges(RaptureHotbarModule.HotbarSlotType slotType, uint actionId)
+        {
+            if (slotType != RaptureHotbarModule.HotbarSlotType.Action || actionId == 0)
+                return (0, 0);
+
+            var actionManager = ActionManager.Instance();
+            if (actionManager == null)
+                return (0, 0);
+
+            uint effectiveId = actionManager->GetAdjustedActionId(actionId);
+            ushort maxCh = ActionManager.GetMaxCharges(effectiveId, 0);
+            if (maxCh <= 1)
+                return (0, 0);
+
+            uint currentCh = actionManager->GetCurrentCharges(effectiveId);
+            return ((int)currentCh, (int)maxCh);
+        }
+
         private static unsafe (int CooldownPercent, int SecondsLeft) GetSlotCooldown(RaptureHotbarModule.HotbarSlot* slot)
         {
             if (slot == null) return (0, 0);

Helpers/InputsHelper.cs

@@ -142,8 +142,22 @@ namespace HSUI.Helpers
                 return;
             }
 
+            // Restore WndProc first so left-click works again immediately after unload.
+            // After a game/Dalamud patch, other singletons may be disposed before us;
+            // if we unsub or touch config first and that throws, we would never restore and LButton stays broken.
+            RestoreWndProc();
+
+            try
+            {
                 ConfigurationManager.Instance.ResetEvent -= OnConfigReset;
+            }
+            catch { /* Instance may already be disposed */ }
+
+            try
+            {
                 Plugin.Framework.Update -= OnFrameworkUpdate;
+            }
+            catch { /* Framework may already be disposed */ }
 
             Plugin.Logger.Info("\t\tDisposing _requestActionHook: " + (_requestActionHook?.Address.ToString("X") ?? "null"));
             _requestActionHook?.Disable();
@@ -151,9 +165,6 @@ namespace HSUI.Helpers
             _executeSlotByIdHook?.Disable();
             _executeSlotByIdHook?.Dispose();
 
-            // give imgui the control of inputs again
-            RestoreWndProc();
-
             Instance = null!;
         }
         #endregion
@@ -556,15 +567,21 @@ namespace HSUI.Helpers
 
         private void RestoreWndProc()
         {
-            if (_wndHandle != IntPtr.Zero && _imguiWndProcPtr != IntPtr.Zero)
+            if (_wndHandle == IntPtr.Zero || _imguiWndProcPtr == IntPtr.Zero)
+                return;
+
+            try
             {
                 Plugin.Logger.Info("\t\tRestoring WndProc");
-                Plugin.Logger.Info("\t\t\tOld _wndHandle = " + _wndHandle.ToString("X"));
-                Plugin.Logger.Info("\t\t\tOld _imguiWndProcPtr = " + _imguiWndProcPtr.ToString("X"));
-
                 SetWindowLongPtr(_wndHandle, GWL_WNDPROC, _imguiWndProcPtr);
-                Plugin.Logger.Info("\t\t\tDone!");
+                Plugin.Logger.Info("\t\t\tWndProc restored.");
-
+            }
+            catch (Exception ex)
+            {
+                Plugin.Logger.Warning($"\t\tRestoreWndProc failed: {ex.Message}");
+            }
+            finally
+            {
                 _wndHandle = IntPtr.Zero;
                 _imguiWndProcPtr = IntPtr.Zero;
             }

Helpers/TooltipsHelper.cs

@@ -6,6 +6,7 @@ using HSUI.Config;
 using HSUI.Config.Attributes;
 using HSUI.Interface.GeneralElements;
 using Dalamud.Bindings.ImGui;
+using FFXIVClientStructs.FFXIV.Client.Game.Object;
 using System;
 using System.Numerics;
 using System.Text;
@@ -55,18 +56,21 @@ namespace HSUI.Helpers
         private string? _currentTooltipTitle = null;
         private Vector2 _titleSize;
         private string? _previousRawText = null;
+        private uint? _currentIconId = null;
 
         private Vector2 _position;
         private Vector2 _size;
 
         private bool _dataIsValid = false;
 
-        public void ShowTooltipOnCursor(string text, string? title = null, uint id = 0, string name = "")
+        private const float IconSize = 24f;
+
+        public void ShowTooltipOnCursor(string text, string? title = null, uint id = 0, string name = "", uint? iconId = null)
         {
-            ShowTooltip(text, ImGui.GetMousePos(), title, id, name);
+            ShowTooltip(text, ImGui.GetMousePos(), title, id, name, iconId);
         }
 
-        public void ShowTooltip(string text, Vector2 position, string? title = null, uint id = 0, string name = "")
+        public void ShowTooltip(string text, Vector2 position, string? title = null, uint id = 0, string name = "", uint? iconId = null)
         {
             if (text == null)
             {
@@ -82,6 +86,8 @@ namespace HSUI.Helpers
                 _previousRawText = text;
             }
 
+            _currentIconId = iconId;
+
             // calcualte title size
             _titleSize = Vector2.Zero;
             if (title != null)
@@ -113,7 +119,13 @@ namespace HSUI.Helpers
                 _textSize = ImGui.CalcTextSize(_currentTooltipText, false, MaxWidth);
             }
 
-            _size = new Vector2(Math.Max(_titleSize.X, _textSize.X) + Margin * 2, _titleSize.Y + _textSize.Y + Margin * 2);
+            float contentWidth = Math.Max(_titleSize.X, _textSize.X);
+            float contentHeight = _titleSize.Y + _textSize.Y;
+            float iconSizeScaled = IconSize * ImGuiHelpers.GlobalScale * _config.TooltipScale;
+            float iconGap = _currentIconId.HasValue && _currentIconId.Value > 0 ? iconSizeScaled + Margin : 0;
+            _size = new Vector2(
+                contentWidth + iconGap + Margin * 2,
+                Math.Max(contentHeight, _currentIconId.HasValue && _currentIconId.Value > 0 ? iconSizeScaled : 0) + Margin * 2);
 
             // position tooltip using the given coordinates as bottom center
             position.X = position.X - _size.X / 2f;
@@ -220,16 +232,29 @@ namespace HSUI.Helpers
             if (string.IsNullOrEmpty(body))
                 body = "(No info)";
 
+            uint? iconId = _worldTooltipConfig.ShowIcon ? GetWorldObjectIconId(mouseOverTarget) : null;
+
             if (_worldTooltipConfig.DetachFromCursor)
             {
-                ShowTooltip(body, _worldTooltipConfig.Position, name);
+                ShowTooltip(body, _worldTooltipConfig.Position, name, 0, "", iconId);
             }
             else
             {
-                ShowTooltipOnCursor(body, name);
+                ShowTooltipOnCursor(body, name, 0, "", iconId);
             }
         }
 
+        private static unsafe uint? GetWorldObjectIconId(IGameObject gameObject)
+        {
+            if (gameObject == null || gameObject.Address == IntPtr.Zero)
+                return null;
+            var obj = (GameObject*)gameObject.Address;
+            if (obj == null)
+                return null;
+            uint iconId = obj->NamePlateIconId;
+            return iconId > 0 ? iconId : null;
+        }
+
         public void RemoveTooltip()
         {
             _dataIsValid = false;
@@ -279,14 +304,26 @@ namespace HSUI.Helpers
             float globalScaleCorrection = -15 + 15 * ImGuiHelpers.GlobalScale;
 
             string fontId = _config.FontID ?? FontsConfig.DefaultSmallFontKey;
-            float wrapWidth = Math.Max(_titleSize.X, _textSize.X) + Margin;
+            float iconSizeScaled = IconSize * ImGuiHelpers.GlobalScale * _config.TooltipScale;
+            float iconGap = (_currentIconId.HasValue && _currentIconId.Value > 0) ? iconSizeScaled + Margin : 0;
+            float wrapWidth = (_currentIconId.HasValue && _currentIconId.Value > 0)
+                ? _size.X - iconGap - Margin * 2
+                : Math.Max(_titleSize.X, _textSize.X) + Margin;
+            float textBlockX = windowMargin.X + Margin + iconGap;
+
+            if (_currentIconId.HasValue && _currentIconId.Value > 0)
+            {
+                var iconPos = _position + new Vector2(Margin, Margin);
+                DrawHelper.DrawIcon(_currentIconId.Value, iconPos, new Vector2(iconSizeScaled, iconSizeScaled), false, drawList);
+            }
+
             if (_currentTooltipTitle != null)
             {
                 // title
                 Vector2 cursorPos;
                 using (FontsManager.Instance.PushFont(fontId))
                 {
-                    cursorPos = new Vector2(windowMargin.X + _size.X / 2f - _titleSize.X / 2f, Margin);
+                    cursorPos = new Vector2(textBlockX, Margin);
                     ImGui.SetCursorPos(cursorPos);
                     ImGui.PushTextWrapPos(cursorPos.X + wrapWidth + globalScaleCorrection);
                     ImGui.TextColored(_config.TitleColor.Vector, _currentTooltipTitle);
@@ -296,7 +333,7 @@ namespace HSUI.Helpers
                 // text
                 using (FontsManager.Instance.PushFont(fontId))
                 {
-                    cursorPos = new Vector2(windowMargin.X + _size.X / 2f - _textSize.X / 2f, Margin + _titleSize.Y);
+                    cursorPos = new Vector2(textBlockX, Margin + _titleSize.Y);
                     ImGui.SetCursorPos(cursorPos);
                     ImGui.PushTextWrapPos(cursorPos.X + wrapWidth + globalScaleCorrection);
                     ImGui.TextColored(_config.TextColor.Vector, _currentTooltipText);
@@ -308,8 +345,8 @@ namespace HSUI.Helpers
                 // text
                 using (FontsManager.Instance.PushFont(fontId))
                 {
-                    var cursorPos = windowMargin + new Vector2(Margin, Margin);
+                    var cursorPos = new Vector2(textBlockX, Margin);
-                    var textWidth = _size.X - Margin * 2;
+                    var textWidth = _size.X - iconGap - Margin * 2;
 
                     ImGui.SetCursorPos(cursorPos);
                     ImGui.PushTextWrapPos(cursorPos.X + textWidth + globalScaleCorrection);
@@ -426,6 +463,10 @@ namespace HSUI.Helpers
         [Order(2, collapseWith = nameof(DetachFromCursor))]
         public Vector2 Position = new Vector2(100, 100);
 
+        [Checkbox("Show Icon (quest/NPC icons)", spacing = true)]
+        [Order(3)]
+        public bool ShowIcon = true;
+
         [Checkbox("Show Level", spacing = true)]
         [Order(5)]
         public bool ShowLevel = true;

Interface/GeneralElements/ActionBarsHud.cs

@@ -216,6 +216,14 @@ namespace HSUI.Interface.GeneralElements
                                 Vector2 labelPos = new Vector2(pos.X + size.X - labelSize.X - 2, pos.Y + size.Y - labelSize.Y - 2);
                                 DrawHelper.DrawOutlinedText(label, labelPos, 0xFFFFFFFF, 0xFF000000, drawList, 1);
                             }
+
+                            if (Config.ShowChargeCount && !slot.IsEmpty && slot.MaxCharges > 1)
+                            {
+                                string chargeText = slot.CurrentCharges.ToString();
+                                Vector2 chargeSize = ImGui.CalcTextSize(chargeText);
+                                Vector2 chargePos = new Vector2(pos.X + 2, pos.Y + 2);
+                                DrawHelper.DrawOutlinedText(chargeText, chargePos, 0xFFFFFFFF, 0xFF000000, drawList, 1);
+                            }
                         }
                     }
                 }
@@ -364,7 +372,7 @@ namespace HSUI.Interface.GeneralElements
                             if (!string.IsNullOrEmpty(title) || !string.IsNullOrEmpty(text))
                             {
                                 string body = string.IsNullOrEmpty(text) ? title : text;
-                                TooltipsHelper.Instance.ShowTooltipOnCursor(body, title, slot.ActionId, "");
+                                TooltipsHelper.Instance.ShowTooltipOnCursor(body, title, slot.ActionId, "", slot.IconId > 0 ? slot.IconId : null);
                                 if (IsTooltipDebugEnabled())
                                     Plugin.Logger.Information($"[HSUI Tooltip DBG] ActionBar tooltip (main overlay): slot={i} title='{title}'");
                             }
@@ -423,7 +431,7 @@ namespace HSUI.Interface.GeneralElements
                         if (!string.IsNullOrEmpty(title) || !string.IsNullOrEmpty(text))
                         {
                             string body = string.IsNullOrEmpty(text) ? title : text;
-                            TooltipsHelper.Instance.ShowTooltipOnCursor(body, title, slot.ActionId, "");
+                            TooltipsHelper.Instance.ShowTooltipOnCursor(body, title, slot.ActionId, "", slot.IconId > 0 ? slot.IconId : null);
                             if (IsTooltipDebugEnabled())
                                 Plugin.Logger.Information($"[HSUI Tooltip DBG] ActionBar tooltip (overlay): slot={i} title='{title}'");
                         }

Interface/GeneralElements/HotbarsConfig.cs

@@ -63,15 +63,19 @@ namespace HSUI.Interface.GeneralElements
         [Order(28)]
         public bool ShowSlotNumbers = true;
 
-        [Checkbox("Show Combo Highlight")]
+        [Checkbox("Show Charge Count")]
         [Order(29)]
+        public bool ShowChargeCount = true;
+
+        [Checkbox("Show Combo Highlight")]
+        [Order(30)]
         public bool ShowComboHighlight = true;
 
         [Checkbox("Show Keypress Flash")]
-        [Order(30)]
+        [Order(31)]
         public bool ShowKeypressFlash = true;
 
-        [NestedConfig("Combo Highlight", 31)]
+        [NestedConfig("Combo Highlight", 32)]
         public ComboHighlightConfig ComboHighlightConfig = new();
 
         [Checkbox("Debug Drag & Drop")]

Interface/Party/PartyFramesCooldownListHud.cs

@@ -283,10 +283,13 @@ namespace HSUI.Interface.Party
                 // tooltip
                 if (Config.ShowTooltips)
                 {
+                    uint? iconId = hoveringCooldown.Data.IconId > 0 ? hoveringCooldown.Data.IconId : null;
                     TooltipsHelper.Instance.ShowTooltipOnCursor(
                         hoveringCooldown.TooltipText(),
                         hoveringCooldown.Data.Name,
-                        hoveringCooldown.Data.ActionId
+                        hoveringCooldown.Data.ActionId,
+                        "",
+                        iconId
                     );
                 }
             }

Interface/PartyCooldowns/PartyCooldownsHud.cs

@@ -304,10 +304,13 @@ namespace HSUI.Interface.PartyCooldowns
                     pos = origin + new Vector2(pos.X - size.Y + 1, pos.Y);
                     if (Config.ShowTooltips && ImGui.IsMouseHoveringRect(pos, pos + _barConfig.Size))
                     {
+                        uint? iconId = cooldown.Data.IconId > 0 ? cooldown.Data.IconId : null;
                         TooltipsHelper.Instance.ShowTooltipOnCursor(
                             cooldown.TooltipText(),
                             cooldown.Data.Name,
-                            cooldown.Data.ActionId
+                            cooldown.Data.ActionId,
+                            "",
+                            iconId
                         );
                     }
 

Interface/StatusEffects/StatusEffectsListHud.cs

@@ -468,11 +468,13 @@ namespace HSUI.Interface.StatusEffects
                 // tooltip
                 if (Config.ShowTooltips)
                 {
+                    uint? iconId = data.Data.Icon > 0 ? data.Data.Icon : null;
                     TooltipsHelper.Instance.ShowTooltipOnCursor(
                         EncryptedStringsHelper.GetString(data.Data.Description.ToDalamudString().ToString()),
                         EncryptedStringsHelper.GetString(data.Data.Name.ToString()),
                         data.Status.StatusId,
-                        GetStatusActorName(data.Status)
+                        GetStatusActorName(data.Status),
+                        iconId
                     );
                 }
 

changelog.md

@@ -1,3 +1,11 @@
+# 1.0.7.0
+- **Hotbars**: Charge count on slots — abilities with charges (e.g. 2-stack) show the current charge number in the top-left of the slot; keybind stays in the bottom-right. Toggle in Hotbars → Show Charge Count.
+- **Fix**: Left-click no longer stays broken after disabling HSUI. WndProc is restored first on plugin unload so the game window gets normal input back even when disposal order changes (e.g. after a patch).
+
+# 1.0.6.0
+- **Tooltips**: Icons in tooltips — action bars, status effects, and party cooldowns now show the item's icon next to the tooltip text when available.
+- **World Object Tooltip**: Quest/NPC icons — hovering over NPCs or objects displays their quest or state icon (e.g., exclamation marks, turn-in checks) in the tooltip. Toggle in Misc → World Tooltip → Show Icon.
+
 # 1.0.5.0
 - **World Object Tooltip**: Hover over players, NPCs, or objects in the world to see a tooltip with name, level, HP, job (players), FC tag (optional), distance, and object ID. Enable in Misc → World Tooltip; optional detach-from-cursor with fixed position.
 

pluginmaster.json

@@ -4,9 +4,9 @@
     "Name": "HSUI",
     "Punchline": "A modern HUD replacement built for customization.",
     "Description": "HSUI provides a highly configurable HUD replacement for FFXIV, recreated from DelvUI using KamiToolKit, FFXIVClientStructs, and Dalamud. Features unit frames, castbars, job gauges, nameplates, party frames, status effects, enemy list, configurable hotbars with drag-and-drop, and profiles.",
-    "Changelog": "World Object Tooltip: hover over players/NPCs/objects for name, level, HP, job, FC tag, distance; optional detach-from-cursor. PvP nameplates: GC icons, Role/Job icon. Main Actions tooltips. Alliance frame fixes.",
+    "Changelog": "Hotbars: Charge count on slots (top-left). Fix: Left-click works again after disabling plugin (WndProc restore on unload).",
     "InternalName": "HSUI",
-    "AssemblyVersion": "1.0.5.0",
+    "AssemblyVersion": "1.0.7.0",
     "RepoUrl": "https://github.com/Knack117/HSUI",
     "ApplicableVersion": "any",
     "Tags": ["UI", "HUD", "Unit Frames", "Nameplates", "Party Frames", "Hotbars"],
@@ -14,11 +14,11 @@
     "DalamudApiLevel": 14,
     "IconUrl": "https://raw.githubusercontent.com/Knack117/HSUI/main/Media/Images/icon.png",
     "ImageUrls": [],
-    "DownloadLinkInstall": "https://github.com/Knack117/HSUI/releases/download/v1.0.5.0/latest.zip",
+    "DownloadLinkInstall": "https://github.com/Knack117/HSUI/releases/download/v1.0.7.0/latest.zip",
     "IsHide": false,
     "IsTestingExclusive": false,
-    "DownloadLinkTesting": "https://github.com/Knack117/HSUI/releases/download/v1.0.5.0/latest.zip",
+    "DownloadLinkTesting": "https://github.com/Knack117/HSUI/releases/download/v1.0.7.0/latest.zip",
-    "DownloadLinkUpdate": "https://github.com/Knack117/HSUI/releases/download/v1.0.5.0/latest.zip",
+    "DownloadLinkUpdate": "https://github.com/Knack117/HSUI/releases/download/v1.0.7.0/latest.zip",
-    "LastUpdate": "1738368000"
+    "LastUpdate": "1738540800"
   }
 ]