1.0.8.3: Restore WndProc at start of teardown so left-click works after disable
Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
+3
-3
@@ -9,9 +9,9 @@
|
|||||||
|
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<AssemblyName>HSUI</AssemblyName>
|
<AssemblyName>HSUI</AssemblyName>
|
||||||
<AssemblyVersion>1.0.8.2</AssemblyVersion>
|
<AssemblyVersion>1.0.8.3</AssemblyVersion>
|
||||||
<FileVersion>1.0.8.2</FileVersion>
|
<FileVersion>1.0.8.3</FileVersion>
|
||||||
<InformationalVersion>1.0.8.2</InformationalVersion>
|
<InformationalVersion>1.0.8.3</InformationalVersion>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
|
|||||||
@@ -2,7 +2,7 @@
|
|||||||
"Author": "Knack117",
|
"Author": "Knack117",
|
||||||
"Name": "HSUI",
|
"Name": "HSUI",
|
||||||
"InternalName": "HSUI",
|
"InternalName": "HSUI",
|
||||||
"AssemblyVersion": "1.0.8.2",
|
"AssemblyVersion": "1.0.8.3",
|
||||||
"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.",
|
"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",
|
"ApplicableVersion": "any",
|
||||||
"RepoUrl": "https://github.com/Knack117/HSUI",
|
"RepoUrl": "https://github.com/Knack117/HSUI",
|
||||||
|
|||||||
+16
-1
@@ -565,7 +565,8 @@ namespace HSUI.Helpers
|
|||||||
Plugin.Logger.Info("\tOld WndProc: " + _imguiWndProcPtr.ToString("X"));
|
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)
|
if (_wndHandle == IntPtr.Zero || _imguiWndProcPtr == IntPtr.Zero)
|
||||||
return;
|
return;
|
||||||
@@ -584,6 +585,20 @@ namespace HSUI.Helpers
|
|||||||
{
|
{
|
||||||
_wndHandle = IntPtr.Zero;
|
_wndHandle = IntPtr.Zero;
|
||||||
_imguiWndProcPtr = 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}");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -438,6 +438,9 @@ namespace HSUI
|
|||||||
{
|
{
|
||||||
if (!disposing) return;
|
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
|
// Stop UI callbacks first so no Draw/OpenConfigUi runs during teardown
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -1,3 +1,6 @@
|
|||||||
|
# 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
|
# 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.
|
- **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.
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user