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

Merge branch '1.2' into IconOverhaul

Browse Source
This commit is contained in:
W2.Wizard
2021-05-13 15:21:36 +02:00
committed by GitHub
parent d54efc73f1 2c51f79c0a
commit 887b52c18a
577 changed files with 26583 additions and 26529 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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