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

Fix rare issues with shift tree selection

Browse Source
This commit is contained in:
Wojtek Figat
2025-08-19 23:00:29 +02:00
parent 8136691914
commit 2c1713d300
1 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
Source/Editor/GUI/Tree/Tree.cs
View File

@@ -399,14 +399,17 @@ namespace FlaxEditor.GUI.Tree
bool keyDownArrow = window.GetKey(KeyboardKeys.ArrowDown); bool keyDownArrow = window.GetKey(KeyboardKeys.ArrowDown);
// Use last selection for last selected node if sift is down // Use last selection for last selected node if sift is down
if (shiftDown) if (Selection.Count < 2)
_lastSelectedNode = null;
else if (shiftDown)
_lastSelectedNode ??= Selection[^1]; _lastSelectedNode ??= Selection[^1];
var node = _lastSelectedNode ?? SelectedNode; // Skip root to prevent blocking input
if (_lastSelectedNode != null && _lastSelectedNode.IsRoot)
if (Selection.Count == 0)
_lastSelectedNode = null; _lastSelectedNode = null;
var node = _lastSelectedNode ?? SelectedNode;
// Check if has focus and if any node is focused and it isn't a root // Check if has focus and if any node is focused and it isn't a root
if (ContainsFocus && node != null && node.AutoFocus) if (ContainsFocus && node != null && node.AutoFocus)
{ {
@@ -435,7 +438,7 @@ namespace FlaxEditor.GUI.Tree
// Select parent // Select parent
if (toSelect.Contains(parentNode)) if (toSelect.Contains(parentNode))
toSelect.Remove(node); toSelect.Remove(node);
else else if (parentNode != null)
toSelect.Add(parentNode); toSelect.Add(parentNode);
_lastSelectedNode = parentNode; _lastSelectedNode = parentNode;
} }
@@ -450,7 +453,7 @@ namespace FlaxEditor.GUI.Tree
select = select.GetChild(select.ChildrenCount - 1) as TreeNode; select = select.GetChild(select.ChildrenCount - 1) as TreeNode;
} }
if (toSelect.Contains(select)) if (select == null || toSelect.Contains(select))
toSelect.Remove(node); toSelect.Remove(node);
else else
toSelect.Add(select); toSelect.Add(select);
@@ -464,7 +467,7 @@ namespace FlaxEditor.GUI.Tree
{ {
// Select the first child // Select the first child
var select = node.GetChild(0) as TreeNode; var select = node.GetChild(0) as TreeNode;
if (toSelect.Contains(select)) if (select == null || toSelect.Contains(select))
toSelect.Remove(node); toSelect.Remove(node);
else else
toSelect.Add(select); toSelect.Add(select);
@@ -483,7 +486,7 @@ namespace FlaxEditor.GUI.Tree
} }
parentNode = parentNode.Parent as TreeNode; parentNode = parentNode.Parent as TreeNode;
} }
if (toSelect.Contains(select)) if (select == null || toSelect.Contains(select))
toSelect.Remove(node); toSelect.Remove(node);
else else
toSelect.Add(select); toSelect.Add(select);
@@ -493,7 +496,7 @@ namespace FlaxEditor.GUI.Tree
{ {
// Select next parent child // Select next parent child
var select = nodeParent.GetChild(myIndex + 1) as TreeNode; var select = nodeParent.GetChild(myIndex + 1) as TreeNode;
if (toSelect.Contains(select)) if (select == null || toSelect.Contains(select))
toSelect.Remove(node); toSelect.Remove(node);
else else
toSelect.Add(select); toSelect.Add(select);