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

Merge branch 'GoaLitiuM-restore_tabs_fix'

Browse Source
This commit is contained in:
Wojtek Figat
2025-04-07 21:52:38 +02:00
parent 501bb9fa98 09a3eaef83
commit 73c0dcf76b
3 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Source/Editor/Modules/WindowsModule.cs
View File

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

3
Source/Editor/Windows/Assets/AssetEditorWindow.cs
View File

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

8
Source/Engine/UI/GUI/Control.cs
View File

@@ -424,7 +424,7 @@ namespace FlaxEngine.GUI
private void OnUpdateTooltip(float deltaTime) private void OnUpdateTooltip(float deltaTime)
{ {
Tooltip.OnMouseOverControl(this, deltaTime); Tooltip?.OnMouseOverControl(this, deltaTime);
} }
/// <summary> /// <summary>
@@ -742,7 +742,7 @@ namespace FlaxEngine.GUI
// Update tooltip // Update tooltip
if (ShowTooltip && OnTestTooltipOverControl(ref location)) if (ShowTooltip && OnTestTooltipOverControl(ref location))
{ {
Tooltip.OnMouseEnterControl(this); Tooltip?.OnMouseEnterControl(this);
SetUpdate(ref _tooltipUpdate, OnUpdateTooltip); SetUpdate(ref _tooltipUpdate, OnUpdateTooltip);
} }
} }
@@ -759,14 +759,14 @@ namespace FlaxEngine.GUI
{ {
if (_tooltipUpdate == null) if (_tooltipUpdate == null)
{ {
Tooltip.OnMouseEnterControl(this); Tooltip?.OnMouseEnterControl(this);
SetUpdate(ref _tooltipUpdate, OnUpdateTooltip); SetUpdate(ref _tooltipUpdate, OnUpdateTooltip);
} }
} }
else if (_tooltipUpdate != null) else if (_tooltipUpdate != null)
{ {
SetUpdate(ref _tooltipUpdate, null); SetUpdate(ref _tooltipUpdate, null);
Tooltip.OnMouseLeaveControl(this); Tooltip?.OnMouseLeaveControl(this);
} }
} }