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

Merge branch 'Tryibion-UI-actornode-rename-change'

Browse Source
This commit is contained in:
Wojtek Figat
2022-12-27 19:07:35 +01:00
parent 9050377526 25028e1d67
commit 31ecc8a49f
2 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Source/Editor/Content/Tree/ContentTreeNode.cs
View File

@@ -95,19 +95,17 @@ namespace FlaxEditor.Content
{ {
if (!_folder.CanRename) if (!_folder.CanRename)
return; return;
Editor.Instance.Windows.ContentWin.ScrollingOnTreeView(false);
// Start renaming the folder // Start renaming the folder
var dialog = RenamePopup.Show(this, HeaderRect, _folder.ShortName, false); Editor.Instance.Windows.ContentWin.ScrollingOnTreeView(false);
var dialog = RenamePopup.Show(this, TextRect, _folder.ShortName, false);
dialog.Tag = _folder; dialog.Tag = _folder;
dialog.Renamed += popup => dialog.Renamed += popup =>
{ {
Editor.Instance.Windows.ContentWin.Rename((ContentFolder)popup.Tag, popup.Text); Editor.Instance.Windows.ContentWin.Rename((ContentFolder)popup.Tag, popup.Text);
Editor.Instance.Windows.ContentWin.ScrollingOnTreeView(true); Editor.Instance.Windows.ContentWin.ScrollingOnTreeView(true);
}; };
dialog.Closed += popup => dialog.Closed += popup => { Editor.Instance.Windows.ContentWin.ScrollingOnTreeView(true); };
{
Editor.Instance.Windows.ContentWin.ScrollingOnTreeView(true);
};
} }
/// <summary> /// <summary>

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

@@ -282,7 +282,7 @@ namespace FlaxEditor.SceneGraph.GUI
(window as PrefabWindow).ScrollingOnTreeView(false); (window as PrefabWindow).ScrollingOnTreeView(false);
// Start renaming the actor // Start renaming the actor
var dialog = RenamePopup.Show(this, HeaderRect, _actorNode.Name, false); var dialog = RenamePopup.Show(this, TextRect, _actorNode.Name, false);
dialog.Renamed += OnRenamed; dialog.Renamed += OnRenamed;
dialog.Closed += popup => dialog.Closed += popup =>
{ {