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

Fix mouse warping when controlling camera in Editor viewport on macOS

Browse Source
This commit is contained in:
Ari Vuollet
2026-04-04 19:17:26 +03:00
parent fd334769b2
commit 3288fe4006
1 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
Source/Engine/Platform/SDL/SDLInput.cpp
View File

@@ -359,7 +359,6 @@ class SDLMouse : public Mouse
private:
Float2 _oldPosition = Float2::Zero;
Window* _relativeModeWindow = nullptr;
const SDL_Rect* _oldScreenRect = nullptr;
public:
/// <summary>
@@ -408,13 +407,14 @@ public:
{
_relativeModeWindow = window;
SDL_GetMouseState(&_oldPosition.X, &_oldPosition.Y);
#if !PLATFORM_MAC
if (!SDL_CursorVisible())
{
// Trap the cursor in current location
// Trap the cursor in current location to prevent accidental interactions with other UI elements or applications
SDL_Rect clipRect = { (int)_oldPosition.X, (int)_oldPosition.Y, 1, 1 };
_oldScreenRect = SDL_GetWindowMouseRect(windowHandle);
SDL_SetWindowMouseRect(windowHandle, &clipRect);
}
#endif
}
else
{
@@ -423,9 +423,8 @@ public:
// FIXME: When floating game window is focused and editor viewport activated, the relative mode gets stuck
return;
}
SDL_SetWindowMouseRect(windowHandle, nullptr);//oldScreenRect);
SDL_SetWindowMouseRect(windowHandle, nullptr);
SDL_WarpMouseInWindow(windowHandle, _oldPosition.X, _oldPosition.Y);
_oldScreenRect = nullptr;
_relativeModeWindow = nullptr;
}
@@ -433,8 +432,8 @@ public:
if (!SDL_SetWindowRelativeMouseMode(windowHandle, relativeMode))
LOG(Error, "Failed to set mouse relative mode: {0}", String(SDL_GetError()));
#if PLATFORM_MAC
// Warping right before entering relative mode seems to generate motion event for relative mode
#if PLATFORM_MAC && false
// Warping right before entering relative mode seems to generate motion event during relative mode
SDL_PumpEvents();
SDL_FlushEvent(SDL_EVENT_MOUSE_MOTION);
#endif