Sort global labels to end

KSP-CKAN · Sep 18, 2021 · f4e3c75 · f4e3c75
1 parent 726bb54
commit f4e3c75
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 7 deletions.
diff --git a/GUI/Dialogs/EditLabelsDialog.cs b/GUI/Dialogs/EditLabelsDialog.cs
@@ -36,7 +36,8 @@ private void LoadTree()
             LabelSelectionTree.Nodes.Clear();
             var groups = this.labels.Labels
                 .GroupBy(l => l.InstanceName)
-                .OrderBy(g => g.Key);
+                .OrderBy(g => g.Key == null)
+                .ThenBy(g => g.Key);
             foreach (var group in groups)
             {
                 string groupName = string.IsNullOrEmpty(group.Key)
@@ -271,12 +272,6 @@ private bool TrySave(out string errMsg)
         {
             if (EditingValid(out errMsg))
             {
-                if (!labels.Labels.Contains(currentlyEditing))
-                {
-                    labels.Labels = labels.Labels
-                        .Concat(new ModuleLabel[] { currentlyEditing })
-                        .ToArray();
-                }
                 currentlyEditing.Name         = NameTextBox.Text;
                 currentlyEditing.Color        = ColorButton.BackColor;
                 currentlyEditing.InstanceName =
@@ -289,6 +284,14 @@ private bool TrySave(out string errMsg)
                 currentlyEditing.AlertOnInstall  = AlertOnInstallCheckBox.Checked;
                 currentlyEditing.RemoveOnInstall = RemoveOnInstallCheckBox.Checked;
                 currentlyEditing.HoldVersion     = HoldVersionCheckBox.Checked;
+                if (!labels.Labels.Contains(currentlyEditing))
+                {
+                    labels.Labels = labels.Labels
+                        .Concat(new ModuleLabel[] { currentlyEditing })
+                        .OrderBy(l => l.InstanceName == null)
+                        .ThenBy(l => l.InstanceName)
+                        .ToArray();
+                }
 
                 EditDetailsPanel.Visible = false;
                 currentlyEditing = null;

diff --git a/GUI/Labels/ModuleLabelList.cs b/GUI/Labels/ModuleLabelList.cs
@@ -3,6 +3,7 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Drawing;
+using System.Runtime.Serialization;
 using Newtonsoft.Json;
 
 namespace CKAN
@@ -63,6 +64,15 @@ public static ModuleLabelList Load(string path)
             }
         }
 
+        [OnDeserialized]
+        private void OnDeserialized(StreamingContext context)
+        {
+            // false < true
+            Labels = Labels.OrderBy(l => l.InstanceName == null)
+                           .ThenBy(l => l.InstanceName)
+                           .ToArray();
+        }
+
         public bool Save(string path)
         {
             try