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

Improve timeline tracks renaming to use shared utility with proper incrementing

Browse Source
This commit is contained in:
Wojtek Figat
2024-10-01 10:16:30 +02:00
parent bfa09e165a
commit d1d14daa1e
2 changed files with 5 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
Source/Editor/GUI/Timeline/Timeline.cs
View File

@@ -1288,10 +1288,7 @@ namespace FlaxEditor.GUI.Timeline
public virtual void AddTrack(Track track, bool withUndo = true)
{
// Ensure name is unique
int idx = 1;
var name = track.Name;
while (!IsTrackNameValid(track.Name))
track.Name = string.Format("{0} {1}", name, idx++);
track.Name = GetValidTrackName(track.Name);
// Add it to the timeline
_tracks.Add(track);
@@ -1843,11 +1840,7 @@ namespace FlaxEditor.GUI.Timeline
/// <returns>The track name.</returns>
public string GetValidTrackName(string name)
{
string newName = name;
int count = 0;
while (!IsTrackNameValid(newName))
newName = string.Format("{0} {1}", name, count++);
return newName;
return Utilities.Utils.IncrementNameNumber(name, IsTrackNameValid);
}
/// <summary>

8
Source/Editor/GUI/Timeline/Track.cs
View File

@@ -854,11 +854,9 @@ namespace FlaxEditor.GUI.Timeline
/// <param name="name">The base name.</param>
public void Rename(string name)
{
string newName = name;
int count = 0;
while (_timeline != null && !_timeline.IsTrackNameValid(newName))
newName = string.Format("{0} {1}", name, count++);
OnRename(newName);
if (_timeline != null)
name = _timeline.GetValidTrackName(name);
OnRename(name);
}
/// <summary>