Merge branch 'fix-actor-drop-focus' of https://github.com/Tryibion/FlaxEngine into Tryibion-fix-actor-drop-focus

This commit is contained in:
Wojtek Figat
2025-01-13 16:08:56 +01:00

View File

@@ -596,11 +596,17 @@ namespace FlaxEditor.SceneGraph.GUI
{ {
bool worldPositionsStays = Root.GetKey(KeyboardKeys.Control) == false; bool worldPositionsStays = Root.GetKey(KeyboardKeys.Control) == false;
var objects = new SceneObject[_dragActors.Objects.Count]; var objects = new SceneObject[_dragActors.Objects.Count];
var treeNodes = new TreeNode[_dragActors.Objects.Count];
for (int i = 0; i < objects.Length; i++) for (int i = 0; i < objects.Length; i++)
{
objects[i] = _dragActors.Objects[i].Actor; objects[i] = _dragActors.Objects[i].Actor;
treeNodes[i] = _dragActors.Objects[i].TreeNode;
}
var action = new ParentActorsAction(objects, newParent, newOrder, worldPositionsStays); var action = new ParentActorsAction(objects, newParent, newOrder, worldPositionsStays);
ActorNode.Root.Undo?.AddAction(action); ActorNode.Root.Undo?.AddAction(action);
action.Do(); action.Do();
ParentTree.Focus();
ParentTree.Select(treeNodes.ToList());
result = DragDropEffect.Move; result = DragDropEffect.Move;
} }
// Drag scripts // Drag scripts