Merge branch 'restore_tabs_fix' of https://github.com/GoaLitiuM/FlaxEngine into GoaLitiuM-restore_tabs_fix

This commit is contained in:
Wojtek Figat
2025-04-07 21:52:31 +02:00
3 changed files with 8 additions and 6 deletions

View File

@@ -838,8 +838,6 @@ namespace FlaxEditor.Modules
// risk of interrupting the user's workflow by potentially selecting
// background tabs.
var window = win.RootWindow?.Window;
if (window == null)
return;
var panel = win.ParentDockPanel;
winData.SelectOnShow = panel.SelectedTab == win;
winData.DockedTabIndex = 0;
@@ -946,6 +944,7 @@ namespace FlaxEditor.Modules
win.ParentDockPanel.MoveTabRight(currentTabIndex);
currentTabIndex++;
}
panel.PerformLayout(true);
}
else
{

View File

@@ -141,6 +141,8 @@ namespace FlaxEditor.Windows.Assets
/// <inheritdoc />
protected override void OnClose()
{
ScriptsBuilder.ScriptsReloadBegin -= OnScriptsReloadBegin;
if (_item != null)
{
// Ensure to remove linkage to the item
@@ -170,6 +172,7 @@ namespace FlaxEditor.Windows.Assets
if (!IsHidden)
{
Editor.Instance.Windows.AddToRestore(this);
Close();
}
}