Switch to popover detection for MenuTracker usages

tznind · tznind · commit e36eca710057 · 2026-04-02T00:15:29.000+01:00
diff --git a/src/UI/Editor.cs b/src/UI/Editor.cs
@@ -1089,9 +1089,10 @@ static void Try(IApplication application, Action action)
             return m;
         }
 
-        if (MenuTracker.Instance.CurrentlyOpenMenuItem != null)
+        var selectedMenuItem = MenuTracker.GetFocusedMenuItemIfAny(app);
+        if (selectedMenuItem != null)
         {
-            return $"Selected: {MenuTracker.Instance.CurrentlyOpenMenuItem.Title}";
+            return $"Selected: {selectedMenuItem.Title}";
         }
 
         var selected = SelectionManager.Instance.Selected.ToArray();
@@ -1164,7 +1165,7 @@ private void ShowHelp()
         {
             return;
         }
-        var menuItem = MenuTracker.Instance.CurrentlyOpenMenuItem;
+        var menuItem = MenuTracker.GetFocusedMenuItemIfAny(app);
 
         // if we are in a menu
         if (menuItem != null)

Original file line number	Diff line number	Diff line change
`@@ -1089,9 +1089,10 @@ static void Try(IApplication application, Action action)`
`1089`	`1089`	`return m;`
`1090`	`1090`	`}`
`1091`	`1091`
`1092`		`- if (MenuTracker.Instance.CurrentlyOpenMenuItem != null)`
	`1092`	`+ var selectedMenuItem = MenuTracker.GetFocusedMenuItemIfAny(app);`
	`1093`	`+ if (selectedMenuItem != null)`
`1093`	`1094`	`{`
`1094`		`- return $"Selected: {MenuTracker.Instance.CurrentlyOpenMenuItem.Title}";`
	`1095`	`+ return $"Selected: {selectedMenuItem.Title}";`
`1095`	`1096`	`}`
`1096`	`1097`
`1097`	`1098`	`var selected = SelectionManager.Instance.Selected.ToArray();`
`@@ -1164,7 +1165,7 @@ private void ShowHelp()`
`1164`	`1165`	`{`
`1165`	`1166`	`return;`
`1166`	`1167`	`}`
`1167`		`- var menuItem = MenuTracker.Instance.CurrentlyOpenMenuItem;`
	`1168`	`+ var menuItem = MenuTracker.GetFocusedMenuItemIfAny(app);`
`1168`	`1169`
`1169`	`1170`	`// if we are in a menu`
`1170`	`1171`	`if (menuItem != null)`