1.0.8.5: Fix other HSUI elements disappearing on hotbar hover (child window overlay)

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

HSUI.csproj

@@ -9,9 +9,9 @@
 
 	<PropertyGroup>
 		<AssemblyName>HSUI</AssemblyName>
-		<AssemblyVersion>1.0.8.0</AssemblyVersion>
-		<FileVersion>1.0.8.0</FileVersion>
-		<InformationalVersion>1.0.8.0</InformationalVersion>
+		<AssemblyVersion>1.0.8.5</AssemblyVersion>
+		<FileVersion>1.0.8.5</FileVersion>
+		<InformationalVersion>1.0.8.5</InformationalVersion>
 	</PropertyGroup>
 
 	<PropertyGroup>

HSUI.json

@@ -2,7 +2,7 @@
   "Author": "Knack117",
   "Name": "HSUI",
   "InternalName": "HSUI",
-  "AssemblyVersion": "1.0.8.0",
+  "AssemblyVersion": "1.0.8.5",
   "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

@@ -129,6 +129,11 @@ namespace HSUI.Helpers
 
                 (int pct, int secsLeft) = GetSlotCooldown(slot);
                 (int currentCharges, int maxCharges) = GetSlotCharges(slotType, actionId);
+                // For charge-based actions, don't grey out the icon until all charges are spent.
+                // Use both the slot's recast-charge count and ActionManager so we catch all cases.
+                uint apparentCharges = slotType == RaptureHotbarModule.HotbarSlotType.Action ? slot->GetApparentIconRecastCharges() : 0;
+                if (maxCharges > 1 && (apparentCharges > 0 || currentCharges > 0))
+                    usable = true;
                 list.Add(new SlotInfo(iconId, false, usable, pct, secsLeft, actionId, slotType, keybind, currentCharges, maxCharges));
             }
 

Helpers/InputsHelper.cs

@@ -565,7 +565,8 @@ namespace HSUI.Helpers
             Plugin.Logger.Info("\tOld WndProc: " + _imguiWndProcPtr.ToString("X"));
         }
 
-        private void RestoreWndProc()
+        /// <summary>Restore the game window's WndProc so left-click works again. Idempotent.</summary>
+        internal void RestoreWndProc()
         {
             if (_wndHandle == IntPtr.Zero || _imguiWndProcPtr == IntPtr.Zero)
                 return;
@@ -584,6 +585,20 @@ namespace HSUI.Helpers
             {
                 _wndHandle = IntPtr.Zero;
                 _imguiWndProcPtr = IntPtr.Zero;
+                _wndProcPtr = IntPtr.Zero;
+            }
+        }
+
+        /// <summary>Call at the very start of plugin disable so left-click is restored even if disposal fails later.</summary>
+        public static void RestoreWndProcIfNeeded()
+        {
+            try
+            {
+                Instance?.RestoreWndProc();
+            }
+            catch (Exception ex)
+            {
+                Plugin.Logger?.Warning($"[HSUI] RestoreWndProcIfNeeded: {ex.Message}");
             }
         }
 

Interface/GeneralElements/ActionBarsHud.cs

@@ -253,7 +253,7 @@ namespace HSUI.Interface.GeneralElements
             });
 
             // Overlay at HIGHEST so it captures input above the bar; required for icon swap.
-            // Use unique ID per hotbar to avoid any cross-bar conflicts (bar 2–10 had input capture issues).
+            // Draw as a child of HSUI_HUD so hovering does not create a separate toplevel window that hides other HSUI elements.
             AddDrawAction(StrataLevel.HIGHEST, () =>
             {
                 var slots = ActionBarsManager.Instance.GetSlotData(Config.HotbarIndex, Config.SlotCount);
@@ -262,13 +262,11 @@ namespace HSUI.Interface.GeneralElements
                     | ImGuiWindowFlags.NoFocusOnAppearing | ImGuiWindowFlags.NoBringToFrontOnFocus
                     | ImGuiWindowFlags.NoNav;
 
-                ImGuiHelpers.ForceNextWindowMainViewport();
-                ImGui.SetNextWindowPos(topLeft);
-                ImGui.SetNextWindowSize(barSize);
                 string overlayId = $"HSUI_Hotbar{Config.HotbarIndex}_input";
-                if (!ImGui.Begin(overlayId, flags))
+                ImGui.SetCursorScreenPos(topLeft);
+                if (!ImGui.BeginChild(overlayId, barSize, false, flags))
                 {
-                    ImGui.End();
+                    ImGui.EndChild();
                     return;
                 }
 
@@ -394,7 +392,7 @@ namespace HSUI.Interface.GeneralElements
                     _lastLoggedPickupSlotId = -1;
                 }
 
-                ImGui.End();
+                ImGui.EndChild();
             });
         }
 
@@ -1194,12 +1192,34 @@ namespace HSUI.Interface.GeneralElements
                 slot.SlotType == RaptureHotbarModule.HotbarSlotType.CraftAction ||
                 slot.SlotType == RaptureHotbarModule.HotbarSlotType.PetAction)
             {
-                var row = Plugin.DataManager.GetExcelSheet<LuminaAction>()?.GetRow(slot.ActionId);
+                uint actionIdForLookup = slot.ActionId;
+                LuminaAction? actionRow = null;
+
+                var actionSheet = Plugin.DataManager.GetExcelSheet<LuminaAction>();
+                var actionRowOpt = actionSheet?.GetRow(slot.ActionId);
+                if (actionRowOpt.HasValue)
+                {
+                    actionRow = actionRowOpt.Value;
+                }
+                else if (slot.SlotType == RaptureHotbarModule.HotbarSlotType.CraftAction)
+                {
+                    // Crafting actions: hotbar may store CraftAction sheet row ID (1-based). Action sheet uses 100000+ range (100001 = Basic Synthesis).
+                    const uint CraftActionToActionOffset = 100000;
+                    uint mappedId = slot.ActionId + CraftActionToActionOffset;
+                    var mappedRow = actionSheet?.GetRow(mappedId);
+                    if (mappedRow.HasValue)
+                    {
+                        actionIdForLookup = mappedId;
+                        actionRow = mappedRow.Value;
+                    }
+                }
+
+                var row = actionRow;
                 if (row.HasValue)
                 {
                     string name = row.Value.Name.ToString();
                     string desc = "";
-                    var descRow = Plugin.DataManager.GetExcelSheet<ActionTransient>()?.GetRow(slot.ActionId);
+                    var descRow = Plugin.DataManager.GetExcelSheet<ActionTransient>()?.GetRow(actionIdForLookup);
                     string descRaw = "";
                     if (descRow.HasValue)
                     {

Interface/GeneralElements/VisibilityConfig.cs

@@ -96,6 +96,9 @@ namespace HSUI.Interface
             if (element != null && element.GetType() == typeof(PlayerCastbarHud)) { return true; }
             if (element != null && !element.GetConfig().Enabled) { return false; }
 
+            // Alliance frames only matter in alliance raids (duty). HideInDuty would hide them exactly when needed.
+            bool isAllianceFrames = element != null && element.GetType() == typeof(AllianceFramesHud);
+
             bool isInIslandSanctuary = IsInIslandSanctuary();
             bool isInDuty = IsInDuty() && !isInIslandSanctuary;
             IPlayerCharacter? player = Plugin.ObjectTable.LocalPlayer;
@@ -127,7 +130,8 @@ namespace HSUI.Interface
 
             if (HideOnFullHP && player != null && player.CurrentHp == player.MaxHp) { return false; }
 
-            if (HideInDuty && isInDuty) { return false; }
+            // Alliance frames only matter in alliance raids (duty). Skip HideInDuty for them.
+            if (HideInDuty && isInDuty && !isAllianceFrames) { return false; }
 
             if (HideInIslandSanctuary && isInIslandSanctuary) { return false; }
 

Interface/Party/AllianceManager.cs

@@ -280,14 +280,21 @@ namespace HSUI.Interface.Party
             bool anyChanged = false;
             ref var mainGroup = ref gm->MainGroup;
 
+            // GroupManager layout: _allianceMembers flat array (indices 0-19) has groups 0 and 1.
+            // Group 2 (our party) is stored in _partyMembers. GetAllianceMemberByGroupAndIndex(0/1, slot)
+            // returns empty in-instance for some game versions; use GetAllianceMemberByIndex with flat
+            // indices: group 0 = indices 0-7, group 1 = indices 8-15.
             for (int allianceIdx = 0; allianceIdx < 3; allianceIdx++)
             {
                 int count = 0;
                 var list = new List<IPartyFramesMember>();
 
+                if (allianceIdx == 2)
+                {
+                    // Our party: _partyMembers via GetPartyMemberByIndex
                     for (int slot = 0; slot < 8; slot++)
                     {
-                    var pm = mainGroup.GetAllianceMemberByGroupAndIndex(allianceIdx, slot);
+                        var pm = mainGroup.GetPartyMemberByIndex(slot);
                         if (pm == null || pm->EntityId == 0) continue;
                         var pfMember = new PartyFramesMember(
                             pm->EntityId,
@@ -303,14 +310,14 @@ namespace HSUI.Interface.Party
                         list.Add(pfMember);
                         count++;
                     }
-
-                // GroupManager stores our party in _partyMembers, not GetAllianceMemberByGroupAndIndex.
-                // When group 2 is empty, it's our alliance—populate from GetPartyMemberByIndex.
-                if (count == 0 && allianceIdx == 2)
+                }
+                else
                 {
+                    // Other alliances: _allianceMembers flat indices. Group 0 = 0-7, group 1 = 8-15.
+                    int baseIdx = allianceIdx * 8;
                     for (int slot = 0; slot < 8; slot++)
                     {
-                        var pm = mainGroup.GetPartyMemberByIndex(slot);
+                        var pm = mainGroup.GetAllianceMemberByIndex(baseIdx + slot);
                         if (pm == null || pm->EntityId == 0) continue;
                         var pfMember = new PartyFramesMember(
                             pm->EntityId,
@@ -340,9 +347,11 @@ namespace HSUI.Interface.Party
                     int ourIdx = 0;
                     for (int slot = 0; slot < 8 && ourIdx < _allianceMembers[allianceIdx].Count; slot++)
                     {
-                        PartyMember* pm = allianceIdx == 2
-                            ? mainGroup.GetPartyMemberByIndex(slot)
-                            : mainGroup.GetAllianceMemberByGroupAndIndex(allianceIdx, slot);
+                        PartyMember* pm;
+                        if (allianceIdx == 2)
+                            pm = mainGroup.GetPartyMemberByIndex(slot);
+                        else
+                            pm = mainGroup.GetAllianceMemberByIndex(allianceIdx * 8 + slot);
                         if (pm == null || pm->EntityId == 0) continue;
                         if (_allianceMembers[allianceIdx][ourIdx] is PartyFramesMember pfMember)
                             pfMember.Update(EnmityLevel.Last, PartyMemberStatus.None, ReadyCheckStatus.None, false, pm->ClassJob);

Plugin.cs

@@ -438,6 +438,9 @@ namespace HSUI
         {
             if (!disposing) return;
 
+            // Restore game window WndProc first so left-click works again immediately, even if teardown throws.
+            InputsHelper.RestoreWndProcIfNeeded();
+
             // Stop UI callbacks first so no Draw/OpenConfigUi runs during teardown
             try
             {

changelog.md

@@ -1,3 +1,20 @@
+# 1.0.8.5
+- **Hotbars**: Fixed other HSUI elements disappearing when hovering over hotbar icons — overlay is now a child of the main HUD window instead of a separate window.
+
+# 1.0.8.4
+- **Alliance Frames**: Fixed frames 1 and 2 not showing in alliance raids — populate other alliances via flat GetAllianceMemberByIndex (indices 0–7, 8–15) instead of GetAllianceMemberByGroupAndIndex which returns empty in-instance.
+- **Alliance Frames**: Visibility "Hide in duty" no longer hides alliance frames (they are only relevant in duty).
+- **Hotbars**: Crafting job action tooltips now display — fallback Action sheet lookup when hotbar stores CraftAction row ID.
+
+# 1.0.8.3
+- **Fix**: Left-click no longer sometimes stays broken after disabling HSUI. WndProc is restored at the very start of plugin teardown so the game window gets normal input back even if disposal fails later.
+
+# 1.0.8.2
+- **Action bars**: Charge icons stay lit until all charges are spent — uses the slot’s recast charge count and ActionManager so abilities with charges remaining no longer grey out incorrectly.
+
+# 1.0.8.1
+- **Action bars**: Do not grey out action icons until all charges are spent (initial fix for multi-charge abilities).
+
 # 1.0.8.0
 - **Action Chat Link**: Shift+click an action in the Actions & Traits menu to insert "You should check out {ActionName}" into chat (or clipboard if chat not focused). Enable in Misc → World Tooltip. Restricted to Actions & Traits only — hotbar shift+click unaffected.
 - **Fix**: Job-specific hotbar actions now persist when changing jobs. Explicitly write to the current class job ID so saves survive job/role switches.

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": "Action Chat Link: Shift+click actions in Actions & Traits to insert 'You should check out X' into chat. Fix: Job-specific hotbar actions now persist when changing jobs.",
+    "Changelog": "1.0.8.2: Charge icons stay lit until all charges spent. 1.0.8.1: Do not grey out action icons until all charges spent.",
     "InternalName": "HSUI",
-    "AssemblyVersion": "1.0.8.0",
+    "AssemblyVersion": "1.0.8.2",
     "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.8.0/latest.zip",
+    "DownloadLinkInstall": "https://github.com/Knack117/HSUI/releases/download/v1.0.8.2/latest.zip",
     "IsHide": false,
     "IsTestingExclusive": false,
-    "DownloadLinkTesting": "https://github.com/Knack117/HSUI/releases/download/v1.0.8.0/latest.zip",
-    "DownloadLinkUpdate": "https://github.com/Knack117/HSUI/releases/download/v1.0.8.0/latest.zip",
+    "DownloadLinkTesting": "https://github.com/Knack117/HSUI/releases/download/v1.0.8.2/latest.zip",
+    "DownloadLinkUpdate": "https://github.com/Knack117/HSUI/releases/download/v1.0.8.2/latest.zip",
     "LastUpdate": "1770007214"
   }
 ]