Sort by enabled and name

blish-hud · Sep 25, 2024 · d6cf600 · d6cf600
1 parent 1113d79
commit d6cf600
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 6 deletions.
diff --git a/Blish HUD/GameServices/ModuleService.cs b/Blish HUD/GameServices/ModuleService.cs
@@ -328,7 +328,15 @@ private void Gw2Instance_Gw2Started(object sender, EventArgs e) {
         private readonly Dictionary<MenuItem, ModuleManager> _moduleMenus = new Dictionary<MenuItem, ModuleManager>();
 
         private IOrderedEnumerable<KeyValuePair<MenuItem, ModuleManager>> GetSortedMenuItems() {
-            return _moduleMenus.OrderBy(c => c.Value.Manifest.Name);
+            return _moduleMenus.OrderByDescending(c => c.Value.Enabled).ThenBy(c => c.Value.Manifest.Name);
+        }
+
+        internal void SortMenuItems() {
+            _rootModuleSettingsMenuItem.ClearChildren();
+
+            foreach (var menuItemPair in this.GetSortedMenuItems()) {
+                menuItemPair.Key.Parent = _rootModuleSettingsMenuItem;
+            }
         }
 
         private void RegisterModuleMenuInSettings(ModuleManager moduleManager) {
@@ -338,11 +346,7 @@ private void RegisterModuleMenuInSettings(ModuleManager moduleManager) {
 
             _moduleMenus.Add(moduleMi, moduleManager);
 
-            _rootModuleSettingsMenuItem.ClearChildren();
-
-            foreach (var menuItemPair in this.GetSortedMenuItems()) {
-                menuItemPair.Key.Parent = _rootModuleSettingsMenuItem;
-            }
+            this.SortMenuItems();
         }
 
         private void UnregisterModuleMenuInSettings(ModuleManager moduleManager) {

diff --git a/Blish HUD/GameServices/Modules/ModuleManager.cs b/Blish HUD/GameServices/Modules/ModuleManager.cs
@@ -113,6 +113,8 @@ public bool TryEnable() {
             this.State.Enabled = this.Enabled;
             GameService.Settings.Save();
 
+            GameService.Module.SortMenuItems();
+
             return this.Enabled;
         }
 
@@ -142,6 +144,8 @@ public void Disable() {
 
             this.State.Enabled = this.Enabled;
             GameService.Settings.Save();
+
+            GameService.Module.SortMenuItems();
         }
 
         public void DeleteModule() {