Add sorting by color, then by name

CnCNet · Jun 17, 2024 · 718cba4 · 718cba4
1 parent 849261b
commit 718cba4
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/src/TSMapEditor/UI/Windows/TriggersWindow.cs b/src/TSMapEditor/UI/Windows/TriggersWindow.cs
@@ -20,7 +20,8 @@ public enum TriggerSortMode
     {
         ID,
         Name,
-        Color
+        Color,
+        ColorThenName,
     }
 
     public class TriggersWindow : INItializableWindow
@@ -304,6 +305,7 @@ public override void Initialize()
             triggerListContextMenu.AddItem("Sort by ID", () => TriggerSortMode = TriggerSortMode.ID);
             triggerListContextMenu.AddItem("Sort by Name", () => TriggerSortMode = TriggerSortMode.Name);
             triggerListContextMenu.AddItem("Sort by Color", () => TriggerSortMode = TriggerSortMode.Color);
+            triggerListContextMenu.AddItem("Sort by Color, then by Name", () => TriggerSortMode = TriggerSortMode.ColorThenName);
             AddChild(triggerListContextMenu);
 
             lbTriggers.AllowRightClickUnselect = false;
@@ -1454,6 +1456,9 @@ private void ListTriggers()
                     break;
                 case TriggerSortMode.Name:
                     sortedTriggers = sortedTriggers.OrderBy(t => t.Name).ThenBy(t => t.ID).ToList();
+                    break;                
+                case TriggerSortMode.ColorThenName:
+                    sortedTriggers = sortedTriggers.OrderBy(t => t.EditorColor).ThenBy(t => t.Name).ToList();
                     break;
                 case TriggerSortMode.ID:
                 default: