From 718ccd4774fe3599204dbace21ffee8cd9ac33f1 Mon Sep 17 00:00:00 2001 From: KIT! Date: Thu, 21 Mar 2024 14:45:59 +0100 Subject: [PATCH] Fixed sorting by Id Sorting by id incorrectly sorted the music order page by alphabetical order instead of numerical order. --- Commons/Controls/MusicOrderViewer.cs | 3 ++- Commons/Controls/SongCard.cs | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Commons/Controls/MusicOrderViewer.cs b/Commons/Controls/MusicOrderViewer.cs index f956392..e3dc201 100644 --- a/Commons/Controls/MusicOrderViewer.cs +++ b/Commons/Controls/MusicOrderViewer.cs @@ -10,6 +10,7 @@ using System.Drawing; using System.Linq; using System; using TaikoSoundEditor.Collections; +using System.Text.RegularExpressions; namespace TaikoSoundEditor.Commons.Controls { @@ -39,7 +40,7 @@ namespace TaikoSoundEditor.Commons.Controls else if (Config.MusicOrderSort == Config.MusicOrderSortValueId) { SongCards.Add(songCard); - SongCards.Sort((c1, c2) => c1.Id.CompareTo(c2.Id)); + SongCards.Sort((c1, c2) => c1.MusicOrder.UniqueId.CompareTo(c2.MusicOrder.UniqueId)); } else if (Config.MusicOrderSort == Config.MusicOrderSortValueGenre) { diff --git a/Commons/Controls/SongCard.cs b/Commons/Controls/SongCard.cs index 4d8d21d..ed823a1 100644 --- a/Commons/Controls/SongCard.cs +++ b/Commons/Controls/SongCard.cs @@ -11,7 +11,7 @@ namespace TaikoSoundEditor.Commons.Controls internal WordList WordList { get; } public IMusicOrder MusicOrder { get; } - public string Id => $"{MusicOrder.UniqueId}.{MusicOrder.Id}"; + public string Id => $"{MusicOrder.UniqueId}. {MusicOrder.Id}"; public string Title => WordList.GetBySong(MusicOrder.Id).JapaneseText; public string Subtitle => WordList.GetBySongSub(MusicOrder.Id).JapaneseText; public string Genre => MusicOrder.Genre.ToString();