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

Fix tree nodes culling when using search in scene tree

Browse Source 
#2462
This commit is contained in:
Wojtek Figat
2024-06-17 21:44:31 +02:00
parent f52059522b
commit a67dc00fa3
1 changed files with 19 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
Source/Editor/GUI/Tree/TreeNode.cs
View File

@@ -698,7 +698,7 @@ namespace FlaxEditor.GUI.Tree
} }
} }
// Show tree guide lines // Show tree guidelines
if (Editor.Instance.Options.Options.Interface.ShowTreeLines) if (Editor.Instance.Options.Options.Interface.ShowTreeLines)
{ {
TreeNode parentNode = Parent as TreeNode; TreeNode parentNode = Parent as TreeNode;
@@ -753,15 +753,16 @@ namespace FlaxEditor.GUI.Tree
var children = _children; var children = _children;
if (children.Count == 0) if (children.Count == 0)
return; return;
var last = children.Count - 1;
if (CullChildren) if (CullChildren)
{ {
Render2D.PeekClip(out var globalClipping); Render2D.PeekClip(out var globalClipping);
Render2D.PeekTransform(out var globalTransform); Render2D.PeekTransform(out var globalTransform);
// Try to estimate the rough location of the first node, assuming the node height is constant // Try to estimate the rough location of the first and the last nodes, assuming the node height is constant
var firstChildGlobalRect = GetChildGlobalRectangle(children[0], ref globalTransform); var firstChildGlobalRect = GetChildGlobalRectangle(children[0], ref globalTransform);
var firstVisibleChild = Math.Clamp((int)Math.Floor((globalClipping.Y - firstChildGlobalRect.Top) / _headerHeight) + 1, 0, children.Count - 1); var firstVisibleChild = Math.Clamp((int)Math.Floor((globalClipping.Top - firstChildGlobalRect.Top) / _headerHeight) + 1, 0, last);
if (GetChildGlobalRectangle(children[firstVisibleChild], ref globalTransform).Top > globalClipping.Top || !children[firstVisibleChild].Visible) if (GetChildGlobalRectangle(children[firstVisibleChild], ref globalTransform).Top > globalClipping.Top || !children[firstVisibleChild].Visible)
{ {
// Estimate overshoot, either it's partially visible or hidden in the tree // Estimate overshoot, either it's partially visible or hidden in the tree
@@ -770,22 +771,29 @@ namespace FlaxEditor.GUI.Tree
var child = children[firstVisibleChild]; var child = children[firstVisibleChild];
if (!child.Visible) if (!child.Visible)
continue; continue;
if (GetChildGlobalRectangle(child, ref globalTransform).Top < globalClipping.Top) if (GetChildGlobalRectangle(child, ref globalTransform).Top < globalClipping.Top)
break; break;
} }
} }
var lastVisibleChild = Math.Clamp((int)Math.Ceiling((globalClipping.Bottom - firstChildGlobalRect.Top) / _headerHeight) + 1, firstVisibleChild, last);
if (GetChildGlobalRectangle(children[lastVisibleChild], ref globalTransform).Top < globalClipping.Bottom || !children[lastVisibleChild].Visible)
{
// Estimate overshoot, either it's partially visible or hidden in the tree
for (; lastVisibleChild < last; lastVisibleChild++)
{
var child = children[lastVisibleChild];
if (!child.Visible)
continue;
if (GetChildGlobalRectangle(child, ref globalTransform).Top > globalClipping.Bottom)
break;
}
}
for (int i = firstVisibleChild; i < children.Count; i++) for (int i = firstVisibleChild; i <= lastVisibleChild; i++)
{ {
var child = children[i]; var child = children[i];
if (!child.Visible) if (!child.Visible)
continue; continue;
var childGlobalRect = GetChildGlobalRectangle(child, ref globalTransform);
if (!globalClipping.Intersects(ref childGlobalRect))
break;
Render2D.PushTransform(ref child._cachedTransform); Render2D.PushTransform(ref child._cachedTransform);
child.Draw(); child.Draw();
Render2D.PopTransform(); Render2D.PopTransform();
@@ -799,7 +807,7 @@ namespace FlaxEditor.GUI.Tree
} }
else else
{ {
for (int i = 0; i < children.Count; i++) for (int i = 0; i <= last; i++)
{ {
var child = children[i]; var child = children[i];
if (child.Visible) if (child.Visible)