From 58903759f13f307df17fd781780952a5d92f102e Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Fri, 21 Feb 2020 01:37:36 +0300
Subject: [PATCH] Implement enum attributes to set display order

---
 .../API/Requests/SearchBeatmapSetsRequest.cs  | 41 +++++++++++++++++++
 .../BeatmapListing/BeatmapSearchFilterRow.cs  | 27 +++++++++++-
 2 files changed, 66 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Online/API/Requests/SearchBeatmapSetsRequest.cs b/osu.Game/Online/API/Requests/SearchBeatmapSetsRequest.cs
index e329015f67..58a41b6e08 100644
--- a/osu.Game/Online/API/Requests/SearchBeatmapSetsRequest.cs
+++ b/osu.Game/Online/API/Requests/SearchBeatmapSetsRequest.cs
@@ -1,6 +1,7 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+using System;
 using System.ComponentModel;
 using osu.Framework.IO.Network;
 using osu.Game.Overlays;
@@ -92,19 +93,59 @@ namespace osu.Game.Online.API.Requests
         Electronic = 10
     }
 
+    [HasOrderedElements]
     public enum BeatmapSearchLanguage
     {
+        [Order(0)]
         Any,
+
+        [Order(11)]
         Other,
+
+        [Order(1)]
         English,
+
+        [Order(6)]
         Japanese,
+
+        [Order(2)]
         Chinese,
+
+        [Order(10)]
         Instrumental,
+
+        [Order(7)]
         Korean,
+
+        [Order(3)]
         French,
+
+        [Order(4)]
         German,
+
+        [Order(9)]
         Swedish,
+
+        [Order(8)]
         Spanish,
+
+        [Order(5)]
         Italian
     }
+
+    [AttributeUsage(AttributeTargets.Field)]
+    public class OrderAttribute : Attribute
+    {
+        public readonly int Order;
+
+        public OrderAttribute(int order)
+        {
+            Order = order;
+        }
+    }
+
+    [AttributeUsage(AttributeTargets.Enum)]
+    public class HasOrderedElementsAttribute : Attribute
+    {
+    }
 }
diff --git a/osu.Game/Overlays/BeatmapListing/BeatmapSearchFilterRow.cs b/osu.Game/Overlays/BeatmapListing/BeatmapSearchFilterRow.cs
index 2c046a2bbf..467399dd20 100644
--- a/osu.Game/Overlays/BeatmapListing/BeatmapSearchFilterRow.cs
+++ b/osu.Game/Overlays/BeatmapListing/BeatmapSearchFilterRow.cs
@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
+using System.Linq;
 using JetBrains.Annotations;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
@@ -13,6 +14,7 @@ using osu.Framework.Input.Events;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Graphics.UserInterface;
+using osu.Game.Online.API.Requests;
 using osuTK;
 using osuTK.Graphics;
 
@@ -79,9 +81,30 @@ namespace osu.Game.Overlays.BeatmapListing
 
                 TabContainer.Spacing = new Vector2(10, 0);
 
-                if (typeof(T).IsEnum)
+                var type = typeof(T);
+
+                if (type.IsEnum)
                 {
-                    foreach (var val in (T[])Enum.GetValues(typeof(T)))
+                    if (Attribute.GetCustomAttribute(type, typeof(HasOrderedElementsAttribute)) != null)
+                    {
+                        var enumValues = Enum.GetValues(type).Cast<T>().ToArray();
+                        var enumNames = Enum.GetNames(type);
+
+                        int[] enumPositions = Array.ConvertAll(enumNames, n =>
+                        {
+                            var orderAttr = (OrderAttribute)type.GetField(n).GetCustomAttributes(typeof(OrderAttribute), false)[0];
+                            return orderAttr.Order;
+                        });
+
+                        Array.Sort(enumPositions, enumValues);
+
+                        foreach (var val in enumValues)
+                            AddItem(val);
+
+                        return;
+                    }
+
+                    foreach (var val in (T[])Enum.GetValues(type))
                         AddItem(val);
                 }
             }