From 9debca445e48718787f4667ad0d8d96a26672da6 Mon Sep 17 00:00:00 2001 From: Ethan Lee Date: Tue, 1 Oct 2024 01:28:47 -0400 Subject: [PATCH] Automatically assign TextInputEXT.WindowHandle --- src/FNAPlatform/SDL2_FNAPlatform.cs | 5 +++++ src/FNAPlatform/SDL3_FNAPlatform.cs | 5 +++++ src/Game.cs | 1 + 3 files changed, 11 insertions(+) diff --git a/src/FNAPlatform/SDL2_FNAPlatform.cs b/src/FNAPlatform/SDL2_FNAPlatform.cs index 1d7f8eaa..dcfbbbb2 100644 --- a/src/FNAPlatform/SDL2_FNAPlatform.cs +++ b/src/FNAPlatform/SDL2_FNAPlatform.cs @@ -535,6 +535,11 @@ public static void DisposeWindow(GameWindow window) TouchPanel.WindowHandle = IntPtr.Zero; } + if (TextInputEXT.WindowHandle == window.Handle) + { + TextInputEXT.WindowHandle = IntPtr.Zero; + } + SDL.SDL_DestroyWindow(window.Handle); } diff --git a/src/FNAPlatform/SDL3_FNAPlatform.cs b/src/FNAPlatform/SDL3_FNAPlatform.cs index 448b3bdd..8cdc3441 100644 --- a/src/FNAPlatform/SDL3_FNAPlatform.cs +++ b/src/FNAPlatform/SDL3_FNAPlatform.cs @@ -438,6 +438,11 @@ public static void DisposeWindow(GameWindow window) TouchPanel.WindowHandle = IntPtr.Zero; } + if (TextInputEXT.WindowHandle == window.Handle) + { + TextInputEXT.WindowHandle = IntPtr.Zero; + } + SDL.SDL_DestroyWindow(window.Handle); } diff --git a/src/Game.cs b/src/Game.cs index c71ad3c1..14021ecc 100644 --- a/src/Game.cs +++ b/src/Game.cs @@ -272,6 +272,7 @@ public Game() Window = FNAPlatform.CreateWindow(); Mouse.WindowHandle = Window.Handle; TouchPanel.WindowHandle = Window.Handle; + TextInputEXT.WindowHandle = Window.Handle; FrameworkDispatcher.Update();