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

Improve cursor clipping logic (fix after alt+tab and confine to game window in Editor)

Browse Source 
#691
This commit is contained in:
Wojtek Figat
2022-07-17 00:09:59 +02:00
parent fe0e24357a
commit 7f3a32a69b
7 changed files with 65 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -25,6 +25,7 @@ namespace FlaxEditor.Windows
private float _gameStartTime;
private GUI.Docking.DockState _maximizeRestoreDockState;
private GUI.Docking.DockPanel _maximizeRestoreDockTo;
private CursorLockMode _cursorLockMode = CursorLockMode.None;
/// <summary>
/// Gets the viewport.
@@ -464,6 +465,8 @@ namespace FlaxEditor.Windows
if (Editor.Windows.PropertiesWin.IsDocked)
Editor.Windows.PropertiesWin.Focus();
Screen.CursorVisible = true;
if (Screen.CursorLock == CursorLockMode.Clipped)
Screen.CursorLock = CursorLockMode.None;
}
}
@@ -522,11 +525,18 @@ namespace FlaxEditor.Windows
{
base.OnStartContainsFocus();
// Center mouse in play mode
if (CenterMouseOnFocus && Editor.StateMachine.IsPlayMode && !Editor.StateMachine.PlayingState.IsPaused)
if (Editor.StateMachine.IsPlayMode && !Editor.StateMachine.PlayingState.IsPaused)
{
var center = PointToWindow(Size * 0.5f);
Root.MousePosition = center;
// Center mouse in play mode
if (CenterMouseOnFocus)
{
var center = PointToWindow(Size * 0.5f);
Root.MousePosition = center;
}
// Restore lock mode
if (_cursorLockMode != CursorLockMode.None)
Screen.CursorLock = _cursorLockMode;
}
}
@@ -537,6 +547,9 @@ namespace FlaxEditor.Windows
// Restore cursor visibility (could be hidden by the game)
Screen.CursorVisible = true;
// Cache lock mode
_cursorLockMode = Screen.CursorLock;
}
/// <inheritdoc />