Misc: Sort collections in alphabetical order by default

Piotrekol · Jun 2, 2022 · a9359ff · a9359ff
1 parent f7fc863
commit a9359ff
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 7 deletions.
diff --git a/CollectionManagerDll/DataTypes/Collection.cs b/CollectionManagerDll/DataTypes/Collection.cs
@@ -37,7 +37,7 @@ public class Collection : IEnumerable, ICollection
         /// </summary>
         public Beatmaps KnownBeatmaps { get; } = new Beatmaps();
 
-
+        public override string ToString() => $"osu! map Collection: \"{Name}\" Count: {BeatmapHashes.Count}";
 
         /// <summary>
         /// Total number of beatmaps contained in this collection

diff --git a/GuiComponents/Controls/CollectionListingView.cs b/GuiComponents/Controls/CollectionListingView.cs
@@ -15,7 +15,6 @@ public partial class CollectionListingView : UserControl, ICollectionListingView
     {
         public event GuiHelpers.LoadFileArgs OnLoadFile;
         public event GuiHelpers.CollectionReorderEventArgs OnCollectionReorder;
-
         public string SearchText => textBox_collectionNameSearch.Text;
         public Collections Collections
         {
@@ -61,6 +60,10 @@ public Collections HighlightedCollections
         public event GuiHelpers.CollectionBeatmapsEventArgs BeatmapsDropped;
         public event EventHandler<StringEventArgs> RightClick;
 
+        private CollectionRenderer _collectionRenderer = new CollectionRenderer();
+        private RearrangingDropSink _dropsink = new RearrangingDropSink();
+        private OLVColumn NameColumn;
+
         public CollectionListingView()
         {
             InitializeComponent();
@@ -83,9 +86,6 @@ private void Bind()
 
         }
 
-        private CollectionRenderer _collectionRenderer = new CollectionRenderer();
-        private RearrangingDropSink _dropsink = new RearrangingDropSink();
-
         private void init()
         {
             //ListViewCollections.SelectedIndexChanged += ListViewCollectionsSelectedIndexChanged;
@@ -94,6 +94,8 @@ private void init()
             ListViewCollections.HideSelection = false;
             ListViewCollections.DefaultRenderer = _collectionRenderer;
             ListViewCollections.IsSimpleDragSource = true;
+            ListViewCollections.PrimarySortColumn = NameColumn = ListViewCollections.AllColumns[0];
+            ListViewCollections.PrimarySortOrder = SortOrder.Ascending;
 
             _dropsink.CanDropBetween = true;
             _dropsink.CanDropOnItem = true;
@@ -189,18 +191,19 @@ protected virtual void OnSelectedCollectionChanged()
         {
             SelectedCollectionChanged?.Invoke(this, EventArgs.Empty);
         }
+
         protected virtual void OnSelectedCollectionsChanged()
         {
             SelectedCollectionsChanged?.Invoke(this, EventArgs.Empty);
         }
+
         private void ListViewCollections_ModelDropped(object sender, ModelDropEventArgs e)
         {
             e.Handled = true;
             var targetCollection = (Collection)e.TargetModel;
             if (e.SourceModels[0] is Collection)
             {
-                var nameColumn = ListViewCollections.AllColumns[0];
-                if (ListViewCollections.LastSortColumn != nameColumn || ListViewCollections.LastSortOrder != SortOrder.Ascending)
+                if (ListViewCollections.LastSortColumn != NameColumn || ListViewCollections.LastSortOrder != SortOrder.Ascending)
                     ListViewCollections.Sort(ListViewCollections.AllColumns[0], SortOrder.Ascending);
 
                 var collections = new Collections();