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

Fix renaming selected actor in scene tree after creation and use editor shortcut

Browse Source
This commit is contained in:
Wojtek Figat
2021-06-01 21:10:57 +02:00
parent 0f01683c06
commit 0aa9c865ca
4 changed files with 16 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
Source/Editor/SceneGraph/GUI/ActorTreeNode.cs
View File

@@ -293,21 +293,6 @@ namespace FlaxEditor.SceneGraph.GUI
}
}
/// <inheritdoc />
public override bool OnKeyDown(KeyboardKeys key)
{
if (IsFocused)
{
if (key == KeyboardKeys.F2)
{
StartRenaming();
return true;
}
}
return base.OnKeyDown(key);
}
/// <inheritdoc />
protected override DragDropEffect OnDragEnterHeader(DragData data)
{

8
Source/Editor/Windows/Assets/PrefabWindow.Hierarchy.cs
View File

@@ -163,7 +163,13 @@ namespace FlaxEditor.Windows.Assets
private void Rename()
{
((ActorNode)Selection[0]).TreeNode.StartRenaming();
var selection = Selection;
if (selection.Count != 0 && selection[0] is ActorNode actor)
{
if (selection.Count != 0)
Select(actor);
actor.TreeNode.StartRenaming();
}
}
/// <summary>

1
Source/Editor/Windows/Assets/PrefabWindow.cs
View File

@@ -184,6 +184,7 @@ namespace FlaxEditor.Windows.Assets
InputActions.Add(options => options.Paste, Paste);
InputActions.Add(options => options.Duplicate, Duplicate);
InputActions.Add(options => options.Delete, Delete);
InputActions.Add(options => options.Rename, Rename);
InputActions.Add(options => options.FocusSelection, _viewport.FocusSelection);
}

9
Source/Editor/Windows/SceneTreeWindow.cs
View File

@@ -69,6 +69,7 @@ namespace FlaxEditor.Windows
InputActions.Add(options => options.RotateMode, () => Editor.MainTransformGizmo.ActiveMode = TransformGizmoBase.Mode.Rotate);
InputActions.Add(options => options.ScaleMode, () => Editor.MainTransformGizmo.ActiveMode = TransformGizmoBase.Mode.Scale);
InputActions.Add(options => options.FocusSelection, () => Editor.Windows.EditWin.Viewport.FocusSelection());
InputActions.Add(options => options.Rename, Rename);
}
private void OnSearchBoxTextChanged()
@@ -91,7 +92,13 @@ namespace FlaxEditor.Windows
private void Rename()
{
(Editor.SceneEditing.Selection[0] as ActorNode).TreeNode.StartRenaming();
var selection = Editor.SceneEditing.Selection;
if (selection.Count != 0 && selection[0] is ActorNode actor)
{
if (selection.Count != 0)
Editor.SceneEditing.Select(actor);
actor.TreeNode.StartRenaming();
}
}
private void Spawn(Type type)