From 0f81ececaededdc0e3235cf2f31fdd8583520c91 Mon Sep 17 00:00:00 2001 From: dottools Date: Mon, 30 May 2022 16:14:18 -0500 Subject: [PATCH] Engine SDL: Use screen space coordinates for both mouse pointer set and get position Changed mouse pointer coordinates from client to screen space. Done in order to be consistent with existing engine comments, API help doc string, and how it used to work in Win32 window management code. --- Engine/source/windowManager/sdl/sdlCursorController.cpp | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/Engine/source/windowManager/sdl/sdlCursorController.cpp b/Engine/source/windowManager/sdl/sdlCursorController.cpp index 601df4e19..f4d8913c9 100644 --- a/Engine/source/windowManager/sdl/sdlCursorController.cpp +++ b/Engine/source/windowManager/sdl/sdlCursorController.cpp @@ -64,17 +64,12 @@ S32 PlatformCursorControllerSDL::getDoubleClickHeight() void PlatformCursorControllerSDL::setCursorPosition( S32 x, S32 y ) { - if( PlatformWindowManager::get() && PlatformWindowManager::get()->getFirstWindow() ) - { - AssertFatal( dynamic_cast( PlatformWindowManager::get()->getFirstWindow() ), ""); - PlatformWindowSDL *window = static_cast( PlatformWindowManager::get()->getFirstWindow() ); - SDL_WarpMouseInWindow(window->getSDLWindow(), x, y); - } + SDL_WarpMouseGlobal(x, y); } void PlatformCursorControllerSDL::getCursorPosition( Point2I &point ) { - SDL_GetMouseState( &point.x, &point.y ); + SDL_GetGlobalMouseState( &point.x, &point.y ); } void PlatformCursorControllerSDL::setCursorVisible( bool visible )