Move Mouse window bounds assignment to ApplyWindowChanges

FNA-XNA · Aug 6, 2020 · d926c53 · d926c53
1 parent c665d2e
commit d926c53
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/src/FNAPlatform/SDL2_FNAPlatform.cs b/src/FNAPlatform/SDL2_FNAPlatform.cs
@@ -432,6 +432,14 @@ out mode
 					(uint) SDL.SDL_WindowFlags.SDL_WINDOW_FULLSCREEN_DESKTOP
 				);
 			}
+
+			// Update the mouse window bounds
+			if (Mouse.WindowHandle == window)
+			{
+				Rectangle b = GetWindowBounds(window);
+				Mouse.INTERNAL_WindowWidth = b.Width;
+				Mouse.INTERNAL_WindowHeight = b.Height;
+			}
 		}
 
 		public static Rectangle GetWindowBounds(IntPtr window)

diff --git a/src/Game.cs b/src/Game.cs
@@ -829,10 +829,6 @@ private void BeforeLoop()
 			currentAdapter = FNAPlatform.RegisterGame(this);
 			IsActive = true;
 
-			Rectangle windowBounds = Window.ClientBounds;
-			Mouse.INTERNAL_WindowWidth = windowBounds.Width;
-			Mouse.INTERNAL_WindowHeight = windowBounds.Height;
-
 			// Perform initial check for a touch device
 			TouchPanel.TouchDeviceExists = FNAPlatform.GetTouchCapabilities().IsConnected;
 		}