ToxicMushroom/Dalamud
1
0
Fork 0
mirror of https://github.com/goatcorp/Dalamud.git synced 2025-12-12 10:17:22 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Super quick cleanup of cursor changes, pull in associated ImGuiScene changes

Browse source
This commit is contained in:
meli 2020-01-20 09:58:31 -08:00
parent 348783d394
commit deb208642f
2 changed files with 2 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Dalamud/Interface/InterfaceManager.cs
View file

@ -1,9 +1,6 @@
using System; using System;
using System.Diagnostics;
using System.Linq;
using System.Runtime.InteropServices; using System.Runtime.InteropServices;
using Dalamud.Game; using Dalamud.Game;
using Dalamud.Game.Internal;
using Dalamud.Game.Internal.DXGI; using Dalamud.Game.Internal.DXGI;
using Dalamud.Hooking; using Dalamud.Hooking;
using EasyHook; using EasyHook;
@ -130,7 +127,7 @@ namespace Dalamud.Interface
private IntPtr SetCursorDetour(IntPtr hCursor) { private IntPtr SetCursorDetour(IntPtr hCursor) {
Log.Debug($"hCursor: {hCursor.ToInt64():X} WantCapture: {this.lastWantCapture}"); Log.Debug($"hCursor: {hCursor.ToInt64():X} WantCapture: {this.lastWantCapture}");
if (this.lastWantCapture == true && ImGui_Input_Impl_Direct.Cursors != null && !ImGui_Input_Impl_Direct.Cursors.Contains(hCursor)) if (this.lastWantCapture == true && (!scene?.IsImGuiCursor(hCursor) ?? false))
return IntPtr.Zero; return IntPtr.Zero;
return this.setCursorHook.Original(hCursor); return this.setCursorHook.Original(hCursor);

2
lib/ImGuiScene

@ -1 +1 @@
Subproject commit f1a6ea14c354ecc65d36ab212de3d3ce91b60556 Subproject commit 1ccd799d8f264523ec5473b4ae18e87be0093653