Merge app system menu controls

This commit is contained in:
Blendman974 committed 2026-11-06 04:30:15 +01:00
commit 3f392712ec
15 files changed
+571 -28

No files matched your search

+33
View File
@@ -148,6 +148,39 @@ export class ConfigSettingBoolean<TId extends string = string> extends ConfigSet
}
}
const appFullscreenSettings = new Map<string, ConfigSettingBoolean>();
/** A user choice independent of an app's own temporary immersive mode. */
export function appFullscreenSetting(appId: string): ConfigSettingBoolean {
let setting = appFullscreenSettings.get(appId);
if (!setting) {
setting = new ConfigSettingBoolean({
id: `app-fullscreen-${appId}`, label: "Full screen",
storageKey: `display.fullscreen.${appId}`, defaultValue: false,
reportInAnalytics: false,
});
appFullscreenSettings.set(appId, setting);
}
return setting;
}
const appKeepAwakeSettings = new Map<string, ConfigSettingBoolean>();
/** Independent of full screen; applies only while this app is visible. */
export function appKeepAwakeSetting(appId: string): ConfigSettingBoolean {
let setting = appKeepAwakeSettings.get(appId);
if (!setting) {
setting = new ConfigSettingBoolean({
id: `app-keep-awake-${appId}`, label: "Keep screen awake",
description: "Prevent automatic sleep while this app is visible, in any display mode.",
storageKey: `display.keepAwake.${appId}`, defaultValue: false,
reportInAnalytics: false,
});
appKeepAwakeSettings.set(appId, setting);
}
return setting;
}
type ConfigSettingEnumOptions<TValue extends string, TId extends string> = ConfigSettingOptions<TValue, TId> & {
values: readonly TValue[];
normalize?: (value: string | null | undefined) => TValue;
+2 -1
View File
@@ -1,6 +1,7 @@
import { G2_LENS_HEIGHT, G2_LENS_WIDTH } from "../../graphics/image";
import {
appSwitcherPositionSetting,
appFullscreenSetting,
type AppSwitcherPosition,
displayLayoutSetting,
type DisplayLayout,
@@ -118,7 +119,7 @@ export function setAppImmersive(appId: string, immersive: boolean): boolean {
}
export function isImmersive(appId?: string): boolean {
return appId !== undefined && immersiveApps.has(appId);
return appId !== undefined && (immersiveApps.has(appId) || appFullscreenSetting(appId).get());
}
/** Whether an app's windows span the panel's whole width: Full Screen, or immersive. */
+65 -11
View File
@@ -31,6 +31,9 @@ import type { AssistantContext } from "../../assistant/types";
import { SingleNotificationLayer } from "../notifications";
import {
anthropicApiKeySetting,
appFullscreenSetting,
appKeepAwakeSetting,
toggleSettingMenuItem,
assistantHermesKeySetting,
assistantHermesUrlSetting,
assistantBackendSetting,
@@ -94,7 +97,8 @@ import type { AppSwitcherPosition } from "../dashboard-settings";
* Input flow: every event enters via receiveInput. The shell consumes
* everything while the sidebar or a shell overlay has focus and forwards the
* rest to the focused window. Long-press opens the shell-owned system menu
* (Focus app switcher, Voice input, Brightness, Close window, Debug) without reaching the
* (Focus app switcher, Voice input, Brightness, Close current app, Close all apps,
* Debug) without reaching the
* app, so the shell keeps working when a window's handler hangs; a window
* that claims long-press for a move of its own gets it forwarded instead, and
* holding the press past the escape threshold still opens the system menu.
@@ -109,7 +113,7 @@ export type ShellWindow = {
title: string;
/** Compositor surface this window renders to; configured at connect / launch. */
surfaceId: string;
/** Whether the system menu offers Close window (the launcher is pinned). */
/** Whether the system menu can close this window (the launcher is pinned). */
closeable: boolean;
/**
* True when tap-then-hold currently opens the window's own context menu
@@ -222,6 +226,10 @@ export type ShellConfig = {
* after the shell paint that found it.
*/
onSwitcherBarHeightChanged?: () => void;
/** A per-app full-screen choice changed the viewport and compositor geometry. */
onWindowLayoutChanged?: () => void;
/** An app's keep-awake preference must not keep the lock screen awake. */
isLocked?: () => boolean;
/**
* The Notifications app's window, opened in the background (neither
* foregrounded nor focused) unless it is open already, for the switcher
@@ -655,6 +663,12 @@ class Shell {
if (window) this.closeWindow(window.windowId);
}
/** Snapshot ids: close callbacks may remove themselves or other windows. */
closeAllWindows(): void {
const ids = this.windows.filter(window => window.closeable).map(window => window.windowId);
for (const id of ids) this.closeWindow(id);
}
getWindows(): readonly ShellWindow[] {
return this.windows;
}
@@ -866,7 +880,9 @@ class Shell {
// A foreground window that is playing video holds it off the same way.
const foreground = this.foregroundWindow();
if (this.activeVoiceLayer || this.activeKeyboardLayer || this.assistantSession?.isTurnActive() ||
foreground?.isVoiceCapturing?.() || foreground?.keepsScreenOn?.()) {
foreground?.isVoiceCapturing?.() || foreground?.keepsScreenOn?.() ||
(foreground?.closeable && !this.config.isLocked?.() &&
appKeepAwakeSetting(foreground.appId).get())) {
this.lastInputAtMs = nowMs;
return false;
}
@@ -1073,6 +1089,12 @@ class Shell {
if (this.activeVoiceLayer || !this.stack.isAtBase()) {
return { shell: true, window: false };
}
// The switcher owns its menu even when the selected app uses a hold
// for a game move or voice capture.
if (this.focus === "sidebar") {
this.openEscapeMenu();
return { shell: true, window: false };
}
const window = this.foregroundWindow();
if (!window) {
return { shell: true, window: false };
@@ -1082,10 +1104,6 @@ class Shell {
return { shell: true, window: false };
}
if (!window.holdToTalk) this.startEscapeMenuTimer();
if (this.focus === "sidebar") {
this.focus = "window";
window.onFocus?.(this.lastInput);
}
// The window owns frameId from here (render or explicit finish).
await window.handleInput(event, frameId);
return { shell: true, window: true };
@@ -1096,6 +1114,10 @@ class Shell {
// first), which answers with its own menu or asks for the system menu
// when it has none.
if (event.type === "short-then-long-press") {
if (this.focus === "sidebar" && !this.activeVoiceLayer && this.stack.isAtBase()) {
this.openEscapeMenu();
return { shell: true, window: false };
}
const window = this.foregroundWindow();
if (window?.holdToTalk) {
this.openEscapeMenu();
@@ -1913,7 +1935,7 @@ class Shell {
/**
* The system/escape menu: the entries every window shares (Focus app
* switcher, Voice input, Brightness, Close window) plus Debug. Shell-owned and
* switcher, Voice input, Brightness, Close current app, Close all apps) plus Debug. Shell-owned and
* shell-drawn (never the app's), so an unresponsive app can always be
* closed. It opens for long-press (over the app's own menu too), after an
* extended hold in a window that claims long-press, and on a window's
@@ -1926,16 +1948,16 @@ class Shell {
const items: MenuItem[] = [];
if (foreground.closeable) {
items.push({
label: "Close window",
label: "Close current app",
onSelect: (ctx) => {
// Pop the menu first (its onRemoved returns focus to the sidebar),
// then close the window the menu was opened over.
ctx.stack.pop();
this.closeForegroundWindow();
this.closeWindow(foreground.windowId);
},
});
}
// Close window sits first but the menu opens on Focus app switcher, so a
// Close current app sits first but the menu opens on Focus app switcher, so a
// reflexive tap never closes the window.
const initialSelection = items.length;
items.push(
@@ -1959,6 +1981,38 @@ class Shell {
},
}]),
);
items.push({
label: "Close all apps",
disabled: () => !this.windows.some(window => window.closeable),
onSelect: (ctx) => {
ctx.stack.pop();
this.closeAllWindows();
},
});
if (foreground.closeable) {
const fullscreen = appFullscreenSetting(foreground.appId);
items.push({
label: fullscreen.get() ? "Exit full screen" : "Enter full screen",
description: "Use the whole display for this app.",
onSelect: (ctx) => {
ctx.stack.pop();
if (!this.windows.some(window => window.windowId === foreground.windowId)) return;
fullscreen.set(!fullscreen.get());
this.noteUserActivity();
this.config.onWindowLayoutChanged?.();
this.focusWindow(foreground.windowId);
this.config.requestShellRender();
},
});
items.push(toggleSettingMenuItem(appKeepAwakeSetting(foreground.appId), {
onChange: (ctx) => {
ctx.stack.pop();
this.noteUserActivity();
this.focusWindow(foreground.windowId);
this.config.requestShellRender();
},
}));
}
if (brightnessSetting.get() !== "auto") {
items.push({
label: "Brightness",
+1 -1
View File
@@ -9,7 +9,7 @@ import type { WorkerAppReply } from "./shell/worker-window";
* The window context menu, opened by tap-then-hold: an app's own menu,
* holding its app-specific actions. The shell's system menu (long-press)
* carries the entries every window shares — Focus app switcher, Voice input,
* Close window — so an app with nothing of its own to offer has no menu of
* Close current app, Close all apps — so an app with nothing of its own to offer has no menu of
* its own: tap-then-hold then opens the system menu in its place, so both
* gestures land on the same menu. The system menu is also the safety net:
* shell-owned, so an unresponsive app can always be closed (a window that