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

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

Browse Source
This commit is contained in:
Wojtek Figat
2025-04-07 21:52:31 +02:00
parent 501bb9fa98 5fa54fd0d0
commit 09a3eaef83
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
// 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
{

3
Source/Editor/Windows/Assets/AssetEditorWindow.cs
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();
}
}

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

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