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

Fix Screen.CursorLock in Editor to skip when viewport is unfocused

Browse Source
This commit is contained in:
Wojtek Figat
2026-02-17 11:46:20 +01:00
parent 2a9c6bbd1d
commit 6e7a7c9350
2 changed files with 18 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Editor/Windows/GameWindow.cs
View File

@@ -874,7 +874,7 @@ namespace FlaxEditor.Windows
_cursorVisible = Screen.CursorVisible;
_cursorLockMode = Screen.CursorLock;
Screen.CursorVisible = true;
if (Screen.CursorLock == CursorLockMode.Clipped || Screen.CursorLock == CursorLockMode.Locked)
if (_cursorLockMode != CursorLockMode.None)
Screen.CursorLock = CursorLockMode.None;
// Defocus

17
Source/Engine/Engine/Screen.cpp
View File

@@ -21,6 +21,9 @@ namespace
Nullable<Float2> Size;
bool CursorVisible = true;
CursorLockMode CursorLock = CursorLockMode::None;
#if USE_EDITOR
CursorLockMode PendingCursorLock = CursorLockMode::None;
#endif
bool LastGameViewportFocus = false;
}
@@ -124,7 +127,17 @@ void Screen::SetCursorLock(CursorLockMode mode)
const auto win = Editor::Managed->GetGameWindow(true);
Rectangle bounds(Editor::Managed->GameViewportToScreen(Float2::Zero), Editor::Managed->GetGameWindowSize());
if (win)
{
bounds = Rectangle(win->ScreenToClient(bounds.GetTopLeft()), bounds.Size);
// Don't change lock mode in play mode when viewport doesn't have focus
if (mode != CursorLockMode::None && Editor::IsPlayMode && !Engine::HasGameViewportFocus())
{
PendingCursorLock = mode;
return;
}
PendingCursorLock = CursorLockMode::None;
}
#else
const auto win = Engine::MainWindow;
Rectangle bounds = win != nullptr ? win->GetClientBounds() : Rectangle();
@@ -211,6 +224,10 @@ void ScreenService::Update()
if (gameViewportFocus != LastGameViewportFocus)
Screen::SetCursorVisible(CursorVisible);
LastGameViewportFocus = gameViewportFocus;
// Sync pending cursor lock mode in Editor (eg. when viewport focus can change)
if (PendingCursorLock != CursorLockMode::None && Engine::HasGameViewportFocus())
Screen::SetCursorLock(PendingCursorLock);
#endif
}