Various improvements in Editor code

This commit is contained in:
2023-06-29 16:41:15 +02:00
parent 4741f194f6
commit 656866c1d4
4 changed files with 16 additions and 12 deletions
@@ -1,7 +1,6 @@
// Copyright (c) 2012-2023 Wojciech Figat. All rights reserved.
using System;
using FlaxEditor.Scripting;
using FlaxEngine;
using FlaxEngine.GUI;
using FlaxEngine.Utilities;
@@ -19,6 +19,20 @@ namespace FlaxEditor.Modules
{
}
/// <summary>
/// Opens the specified asset in dedicated editor window.
/// </summary>
/// <param name="asset">The asset.</param>
/// <param name="disableAutoShow">True if disable automatic window showing. Used during workspace layout loading to deserialize it faster.</param>
/// <returns>Opened window or null if cannot open item.</returns>
public EditorWindow Open(Asset asset, bool disableAutoShow = false)
{
if (asset == null)
throw new ArgumentNullException();
var item = Editor.ContentDatabase.FindAsset(asset.ID);
return item != null ? Open(item) : null;
}
/// <summary>
/// Opens the specified item in dedicated editor window.
/// </summary>
@@ -993,11 +993,7 @@ namespace FlaxEditor.Windows.Assets
}
}
if (vsWindow == null)
{
var item = Editor.Instance.ContentDatabase.FindAsset(frame.Script.ID);
if (item != null)
vsWindow = Editor.Instance.ContentEditing.Open(item) as VisualScriptWindow;
}
vsWindow = Editor.Instance.ContentEditing.Open(frame.Script) as VisualScriptWindow;
var node = vsWindow?.Surface.FindNode(frame.NodeId);
_debugStepOutNodesIds.Add(new KeyValuePair<VisualScript, uint>(frame.Script, frame.NodeId));
if (node != null)
@@ -7,7 +7,6 @@ using FlaxEditor.GUI;
using FlaxEditor.GUI.ContextMenu;
using FlaxEditor.GUI.Tabs;
using FlaxEditor.GUI.Tree;
using FlaxEditor.Scripting;
using FlaxEditor.Surface;
using FlaxEditor.Windows.Assets;
using FlaxEngine;
@@ -63,11 +62,7 @@ namespace FlaxEditor.Windows
}
}
if (vsWindow == null)
{
var item = Editor.Instance.ContentDatabase.FindAsset(nodeInfo.Script.ID);
if (item != null)
vsWindow = Editor.Instance.ContentEditing.Open(item) as VisualScriptWindow;
}
vsWindow = Editor.Instance.ContentEditing.Open(nodeInfo.Script) as VisualScriptWindow;
return vsWindow?.Surface.FindNode(nodeInfo.NodeId);
}
return null;