From dd3ffe7ae701d5df9b4201b9fedaf973d48f2bf8 Mon Sep 17 00:00:00 2001
From: assamaral <assamaral@gmail.com>
Date: Mon, 2 Nov 2026 17:38:28 -0300
Subject: [PATCH] Menus list their items in the reference menu tree's order

menus::tree sorts every menu, at every level, by xtask/data/menu-catalog.txt
(embedded with include_str!, so the parity oracle is the one source): the
items the reference has come first, in its order; the rest keep registration
order. The in-window menu bar, the native macOS menu and ui.menu.list all
follow. Labels are unchanged.

Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com>
---
 crates/ui-egui/src/menus.rs | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/crates/ui-egui/src/menus.rs b/crates/ui-egui/src/menus.rs
index 9b9559916..11daaf07f 100644
--- a/crates/ui-egui/src/menus.rs
+++ b/crates/ui-egui/src/menus.rs
@@ -45,6 +45,22 @@ fn reference() -> &'static [Reference] {
     })
 }
 
+/// Put `entries` in `reference`'s order: the items the reference lists first, as it lists them,
+/// then the rest in registration order. Submenus the reference has are ordered the same way.
+fn order(entries: &mut [Entry], reference: &[Reference]) {
+    let position = |label: &str| reference.iter().position(|r| r.label == label).unwrap_or(usize::MAX);
+    entries.sort_by_key(|e| match e {
+        Entry::Item { label, .. } | Entry::Sub { label, .. } => position(label),
+    });
+    for e in entries {
+        if let Entry::Sub { label, children } = e
+            && let Some(r) = reference.iter().find(|r| r.label == *label)
+        {
+            order(children, &r.children);
+        }
+    }
+}
+
 /// File ▸ Open Recent: one `ui.recent.<n>` item per recent file, then Clear Recent Files.
 pub const OPEN_RECENT: &str = "Open Recent";
 const RECENT_ITEM: &str = "ui.recent.";
@@ -658,6 +674,11 @@ pub fn tree(app: &CadApp) -> Vec<(String, Vec<Entry>)> {
         let at = file.iter().position(|e| matches!(e, Entry::Item { id, .. } if id == "open")).map_or(0, |i| i + 1);
         file.insert(at, Entry::Sub { label: OPEN_RECENT.into(), children: recent_entries(app) });
     }
+    for (menu, entries) in &mut out {
+        if let Some(r) = reference().iter().find(|r| r.label == menu) {
+            order(entries, &r.children);
+        }
+    }
     out
 }