GoaLitiuM/FlaxEngine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix mouse relative mode activation triggering mouse move events on Mac

Browse Source
This commit is contained in:
Ari Vuollet
2025-04-21 14:07:16 +03:00
parent 26012d0b74
commit 02f446ccfd
5 changed files with 42 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
Source/Engine/Platform/SDL/SDLPlatform.cpp
View File

@@ -104,7 +104,8 @@ bool SDLPlatform::Init()
if (InitInternal())
return true;
if (UsesWindows() || UsesX11())
#if !PLATFORM_MAC
if (!UsesWayland())
{
// Disable SDL clipboard support
SDL_SetEventEnabled(SDL_EVENT_CLIPBOARD_UPDATE, false);
@@ -116,6 +117,7 @@ bool SDLPlatform::Init()
SDL_SetEventEnabled(SDL_EVENT_DROP_COMPLETE, false);
SDL_SetEventEnabled(SDL_EVENT_DROP_POSITION, false);
}
#endif
SDLInput::Init();
SDLWindow::Init();
@@ -225,20 +227,22 @@ void SDLPlatform::OpenUrl(const StringView& url)
Float2 SDLPlatform::GetMousePosition()
{
Float2 pos;
#if PLATFORM_LINUX
if (UsesWayland())
{
// Wayland doesn't support reporting global mouse position,
// use the last known reported position we got from received window events.
pos = Input::GetMouseScreenPosition();
//if (!SDL_GetGlobalMouseState(&pos.X, &pos.Y))
// LOG(Error, "SDL_GetGlobalMouseState() failed");
return Input::GetMouseScreenPosition();
}
else if (UsesX11())
if (UsesX11())
#elif PLATFORM_LINUX || PLATFORM_MAC
{
Float2 pos;
SDL_GetGlobalMouseState(&pos.X, &pos.Y);
else
pos = Input::GetMouseScreenPosition();
return pos;
return pos;
}
#endif
return Input::GetMouseScreenPosition();
}
void SDLPlatform::SetMousePosition(const Float2& pos)