From 202313829507abf87bc1e71ce9d14301ecb63d45 Mon Sep 17 00:00:00 2001
From: Rob Pilling <robpilling@gmail.com>
Date: Mon, 31 Jul 2023 22:04:20 +0100
Subject: [PATCH] wid_edit: restore alphabetical sort

---
 apps/wid_edit/ChangeLog     | 1 +
 apps/wid_edit/boot.js       | 1 +
 apps/wid_edit/metadata.json | 2 +-
 apps/wid_edit/settings.js   | 2 +-
 4 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/apps/wid_edit/ChangeLog b/apps/wid_edit/ChangeLog
index 93f61b814..7d6707467 100644
--- a/apps/wid_edit/ChangeLog
+++ b/apps/wid_edit/ChangeLog
@@ -4,3 +4,4 @@
       Allow changing widgets into all areas, including bottom widget bar
 0.03: Fix editing widgets whose draw method takes the widget
 0.04: Remove double-sort
+0.05: Restore alphabetical sort
diff --git a/apps/wid_edit/boot.js b/apps/wid_edit/boot.js
index 60912fd6f..fe259f97f 100644
--- a/apps/wid_edit/boot.js
+++ b/apps/wid_edit/boot.js
@@ -14,6 +14,7 @@ Bangle.loadWidgets = (o => ()=>{
   const W = global.WIDGETS;
   global.WIDGETS = {};
   Object.keys(W)
+    .sort() // sort alphabetically. the next sort is stable and preserves this if sortorder matches
     .sort((a, b) => (0|W[b].sortorder)-(0|W[a].sortorder))
     .forEach(k => global.WIDGETS[k] = W[k]);
 })(Bangle.loadWidgets);
diff --git a/apps/wid_edit/metadata.json b/apps/wid_edit/metadata.json
index 02ab216fe..b89640333 100644
--- a/apps/wid_edit/metadata.json
+++ b/apps/wid_edit/metadata.json
@@ -1,6 +1,6 @@
 {
   "id": "wid_edit",
-  "version": "0.04",
+  "version": "0.05",
   "name": "Widget Editor",
   "icon": "icon.png",
   "description": "Customize widget locations",
diff --git a/apps/wid_edit/settings.js b/apps/wid_edit/settings.js
index be09923f2..a632850d6 100644
--- a/apps/wid_edit/settings.js
+++ b/apps/wid_edit/settings.js
@@ -27,7 +27,7 @@
     let W = global.WIDGETS;
     global.WIDGETS = {};
     Object.keys(W)
-      .sort()
+      .sort() // see comment in boot.js
       .sort((a, b) => (0|W[b].sortorder)-(0|W[a].sortorder))
       .forEach(k => {global.WIDGETS[k] = W[k];});
     Bangle.drawWidgets();