Long-press and short-then-long with a context menu open switches between context menus

This commit is contained in:
James Babcock committed 2026-09-01 21:38:52 -07:00
1 parent c364099a8c
commit fddb6ea886
5 files changed
+37

No files matched your search

+7
View File
@@ -27,6 +27,13 @@ export type InputEventPayload =
| { type: "long-press-release"; source: InputSource }
/** G2 2.2.9 tap-then-hold gesture, reserved for the shell system menu. */
| { type: "short-then-long-press"; source: InputSource }
/**
* Not a gesture: a shell -> foreground-window notification that the shell
* opened its system context menu over the window. An app with its own
* context menu up closes it in response, so the two menus never stack.
* Everything else ignores it.
*/
| { type: "system-menu-opened" }
/**
* Spatial (four-way) input, which only a watch can produce: the ring's
* scroll is a one-dimensional cursor, these are directions. Components with
+8
View File
@@ -185,6 +185,14 @@ export function createInProcessWindow(options: InProcessWindowOptions): InProces
},
drawIcon: options.drawIcon ?? windowIcon(options.icon, options.iconLetter),
handleInput: async (event, frameId) => {
// The shell opened its system menu over this window; close our own
// context menu so the two never stack. Never forwarded to app layers.
if (event.type === "system-menu-opened") {
if (stack.popIfTop((layer) => layer instanceof WindowMenuLayer)) {
requestRender();
}
return;
}
// The default long-press response: the window menu. Handled here (not
// per-layer) so it works over submenus and app content alike.
if (event.type === "long-press") {
+14
View File
@@ -650,6 +650,15 @@ class Shell {
// holding the press long enough opens the shell's own menu.
if (event.type === "long-press") {
this.startEscapeMenuTimer();
// A long-press while the system menu is open switches to the app's
// context menu: close the system menu and deliver the press to the
// window as usual (apps conventionally answer it with their menu).
if (
!this.activeVoiceLayer &&
this.stack.popIfTop((layer) => layer instanceof ShellOverlayMenuLayer)
) {
this.config.requestShellRender();
}
if (this.activeVoiceLayer || !this.stack.isAtBase()) {
return { shell: true, window: false };
}
@@ -1183,6 +1192,9 @@ class Shell {
},
});
this.stack.push(new ShellOverlayMenuLayer(items, () => this.yieldFocusToSidebar()));
// Tell the window the system menu opened over it: an app with its own
// context menu up closes it, so the two context menus never stack.
void foreground.handleInput(makeInputEvent({ type: "system-menu-opened" }), 0);
this.config.requestShellRender();
}
@@ -1355,6 +1367,8 @@ export function inputEventToString(event: InputEvent): string {
return `Display wake`;
case "wakeword":
return `Wakeword`;
case "system-menu-opened":
return `System menu opened`;
default:
case "unknown":
return `Unknown event: ${event.kind} ${event.eventSource} ${event.eventType}`;
+7
View File
@@ -68,6 +68,13 @@ export class WindowMenu {
async handleInput(event: InputEvent): Promise<void> {
const stack = this.stack;
if (!stack) return;
// The shell opened its system menu over this window; close ours so the
// two context menus never stack.
if (event.type === "system-menu-opened") {
stack.clearToBase();
this.stack = null;
return;
}
await stack.handleInput(event);
if (stack.isAtBase()) {
this.stack = null;