ZacharyZhang-NY/omarchycn
2
2
Fork 0
Code Issues 1 Pull Requests 2 Actions Packages Projects Releases 3 Wiki Activity

Hide menu submenus when none of their children are visible

Browse Source 
Static submenus and links now inherit visibility from their descendants,
so hardware sections like Touchpad Haptics disappear on machines without
the hardware instead of opening empty. Laptop Display and Mirror Display
are guarded by omarchy-hw-laptop.

The guard evaluator brace-wraps every when/checked condition before
silencing it, so conditions in the jsonc no longer need their own
>/dev/null plumbing, and parents no longer need to repeat their
children's guards.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
This commit is contained in:
David Heinemeier Hansson
2026-07-21 16:30:36 -07:00
co-authored by Claude Fable 5
parent 9d3cb70ee7
commit 2bf4f4a9fb
4 changed files with 68 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
shell/plugins/menu/Menu.qml
+6 -8
View File
@@ -347,13 +347,11 @@ Item {
return MenuModel.childCount(root.items, root.itemOrder, id)
}
// Items whose `when:` evaluated to false are hidden everywhere — nav,
// drilldown, and search. Items with no `when:` are always visible.
// Guarded items are hidden when their `when:` evaluates false. Static
// submenus are also hidden when none of their descendants are visible;
// provider-backed menus stay visible because their rows load on demand.
function isVisible(entry) {
if (!entry) return false
if (!entry.when) return true
var result = root.whenResults[entry.id]
return result === undefined ? true : result
return MenuModel.isVisible(root.items, root.itemOrder, root.whenResults, entry)
}
// Label with the ✓ marker baked in when `checked:` evaluated truthy.
@@ -752,8 +750,8 @@ Item {
for (var i = 0; i < ids.length; i++) {
var entry = root.items[ids[i]]
if (!entry) continue
if (entry.when) script += "if " + entry.when + " >/dev/null 2>&1; then echo " + ids[i] + ":w:1; else echo " + ids[i] + ":w:0; fi\n"
if (entry.checked) script += "if " + entry.checked + " >/dev/null 2>&1; then echo " + ids[i] + ":c:1; else echo " + ids[i] + ":c:0; fi\n"
if (entry.when) script += "if { " + entry.when + "; } >/dev/null 2>&1; then echo " + ids[i] + ":w:1; else echo " + ids[i] + ":w:0; fi\n"
if (entry.checked) script += "if { " + entry.checked + "; } >/dev/null 2>&1; then echo " + ids[i] + ":c:1; else echo " + ids[i] + ":c:0; fi\n"
}
if (!script) {
root.whenResults = ({})