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

Fix Control.GetChildAtRecursive with overlapping controls

Browse Source
This commit is contained in:
Wojtek Figat
2021-08-03 11:14:17 +02:00
parent d4817a95d7
commit b5d2b39c3e
1 changed files with 1 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Source/Engine/UI/GUI/ContainerControl.cs
View File

@@ -301,8 +301,6 @@ namespace FlaxEngine.GUI
for (int i = _children.Count - 1; i >= 0; i--)
{
var child = _children[i];
// Check collision
if (IntersectsChildContent(child, point, out var childLocation))
{
result = child;
@@ -322,13 +320,10 @@ namespace FlaxEngine.GUI
{
if (isValid == null)
throw new ArgumentNullException(nameof(isValid));
Control result = null;
for (int i = _children.Count - 1; i >= 0; i--)
{
var child = _children[i];
// Check collision
if (isValid(child) && IntersectsChildContent(child, point, out var childLocation))
{
result = child;
@@ -349,8 +344,6 @@ namespace FlaxEngine.GUI
for (int i = _children.Count - 1; i >= 0; i--)
{
var child = _children[i];
// Check collision
if (IntersectsChildContent(child, point, out var childLocation))
{
var containerControl = child as ContainerControl;
@@ -360,6 +353,7 @@ namespace FlaxEngine.GUI
child = childAtRecursive;
}
result = child;
break;
}
}
return result;