Sort global labels to end

KSP-CKAN · Aug 17, 2021 · 3e8420a · 3e8420a
1 parent 726bb54
commit 3e8420a
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 1 deletion.
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)
@@ -275,6 +276,8 @@ private bool TrySave(out string errMsg)
  {
  labels.Labels = labels.Labels
  .Concat(new ModuleLabel[] { currentlyEditing })
+ .OrderBy(l => l.InstanceName == null)
+ .ThenBy(l => l.InstanceName)
  .ToArray();
  }
  currentlyEditing.Name = NameTextBox.Text;

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