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

Fix editor viewport input bug regression

Browse Source
This commit is contained in:
Wojciech Figat
2022-07-22 11:12:45 +02:00
parent e4079f011d
commit 3d43586e0f
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Source/Editor/Viewport/EditorViewport.cs
View File

@@ -996,10 +996,10 @@ namespace FlaxEditor.Viewport
// Update input
var window = win.Window;
if (window != null && window.IsFocused && window.IsForegroundWindow)
var canUseInput = window != null && window.IsFocused && window.IsForegroundWindow;
{
// Get input buttons and keys (skip if viewport has no focus or mouse is over a child control)
var isViewportControllingMouse = IsControllingMouse;
var isViewportControllingMouse = canUseInput && IsControllingMouse;
if (isViewportControllingMouse != _isViewportControllingMouse)
{
_isViewportControllingMouse = isViewportControllingMouse;
@@ -1011,7 +1011,7 @@ namespace FlaxEditor.Viewport
bool useMouse = IsControllingMouse || (Mathf.IsInRange(_viewMousePos.X, 0, Width) && Mathf.IsInRange(_viewMousePos.Y, 0, Height));
_prevInput = _input;
var hit = GetChildAt(_viewMousePos, c => c.Visible && !(c is CanvasRootControl));
if (ContainsFocus && hit == null)
if (canUseInput && ContainsFocus && hit == null)
_input.Gather(win.Window, useMouse);
else
_input.Clear();