From 751916151a2cce46663a6352bfcda94ce440efa2 Mon Sep 17 00:00:00 2001 From: Wojtek Figat Date: Thu, 6 Jan 2022 14:40:27 +0100 Subject: [PATCH] Add Loading text info for particle system and animation timelines --- Source/Editor/Windows/Assets/AnimationWindow.cs | 2 ++ Source/Editor/Windows/Assets/ParticleSystemWindow.cs | 2 ++ 2 files changed, 4 insertions(+) diff --git a/Source/Editor/Windows/Assets/AnimationWindow.cs b/Source/Editor/Windows/Assets/AnimationWindow.cs index 12dd4a848..088aceadd 100644 --- a/Source/Editor/Windows/Assets/AnimationWindow.cs +++ b/Source/Editor/Windows/Assets/AnimationWindow.cs @@ -254,6 +254,7 @@ namespace FlaxEditor.Windows.Assets Enabled = false }; _timeline.Modified += MarkAsEdited; + _timeline.SetNoTracksText("Loading..."); // Asset properties _propertiesPresenter = new CustomEditorPresenter(null); @@ -361,6 +362,7 @@ namespace FlaxEditor.Windows.Assets _timeline.Load(_asset); _undo.Clear(); _timeline.Enabled = true; + _timeline.SetNoTracksText(null); ClearEditedFlag(); } } diff --git a/Source/Editor/Windows/Assets/ParticleSystemWindow.cs b/Source/Editor/Windows/Assets/ParticleSystemWindow.cs index acc3c658a..189f737c6 100644 --- a/Source/Editor/Windows/Assets/ParticleSystemWindow.cs +++ b/Source/Editor/Windows/Assets/ParticleSystemWindow.cs @@ -347,6 +347,7 @@ namespace FlaxEditor.Windows.Assets }; _timeline.Modified += OnTimelineModified; _timeline.SelectionChanged += OnTimelineSelectionChanged; + _timeline.SetNoTracksText("Loading..."); // Properties editor var propertiesEditor = new CustomEditorPresenter(_undo, string.Empty); @@ -527,6 +528,7 @@ namespace FlaxEditor.Windows.Assets // Setup _undo.Clear(); _timeline.Enabled = true; + _timeline.SetNoTracksText(null); _propertiesEditor.Select(new GeneralProxy(this)); ClearEditedFlag(); }