Fix update order inconsistencies between machines by exposing an action for when defered layout happens.
This commit is contained in:
@@ -73,6 +73,11 @@ namespace FlaxEditor.GUI.Tree
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
public bool DrawRootTreeLine = true;
|
public bool DrawRootTreeLine = true;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Occurs when the defered layouting happens
|
||||||
|
/// </summary>
|
||||||
|
public event Action OnDeferedLayout;
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Gets or sets the margin for the child tree nodes.
|
/// Gets or sets the margin for the child tree nodes.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
@@ -375,6 +380,7 @@ namespace FlaxEditor.GUI.Tree
|
|||||||
if (_deferLayoutUpdate)
|
if (_deferLayoutUpdate)
|
||||||
{
|
{
|
||||||
base.PerformLayout();
|
base.PerformLayout();
|
||||||
|
OnDeferedLayout?.Invoke();
|
||||||
_deferLayoutUpdate = false;
|
_deferLayoutUpdate = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -92,6 +92,13 @@ namespace FlaxEditor.Windows
|
|||||||
_tree.SelectedChanged += Tree_OnSelectedChanged;
|
_tree.SelectedChanged += Tree_OnSelectedChanged;
|
||||||
_tree.RightClick += OnTreeRightClick;
|
_tree.RightClick += OnTreeRightClick;
|
||||||
_tree.Parent = _sceneTreePanel;
|
_tree.Parent = _sceneTreePanel;
|
||||||
|
_tree.OnDeferedLayout += () => {
|
||||||
|
if(_tree.Selection.Count != 0 && _forceScrollNodeToView)
|
||||||
|
{
|
||||||
|
_forceScrollNodeToView = false;
|
||||||
|
ScrollToSelectedNode();
|
||||||
|
}
|
||||||
|
};
|
||||||
headerPanel.Parent = this;
|
headerPanel.Parent = this;
|
||||||
|
|
||||||
// Setup input actions
|
// Setup input actions
|
||||||
@@ -156,18 +163,6 @@ namespace FlaxEditor.Windows
|
|||||||
PerformLayout();
|
PerformLayout();
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <inheritdoc />
|
|
||||||
public override void Update(float deltaTime)
|
|
||||||
{
|
|
||||||
base.Update(deltaTime);
|
|
||||||
|
|
||||||
if(_tree.Selection.Count != 0 && _forceScrollNodeToView)
|
|
||||||
{
|
|
||||||
_forceScrollNodeToView = false;
|
|
||||||
ScrollToSelectedNode();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private void Spawn(Type type)
|
private void Spawn(Type type)
|
||||||
{
|
{
|
||||||
// Create actor
|
// Create actor
|
||||||
|
|||||||
Reference in New Issue
Block a user