forked from Blendman974/faceclaw
feat: add app switcher actions to close current or all apps
This commit is contained in:
4 files changed
+215
-7
No files matched your search
+31
-6
@@ -94,7 +94,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 +110,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
|
||||
@@ -655,6 +656,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;
|
||||
}
|
||||
@@ -1073,6 +1080,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 };
|
||||
@@ -1096,6 +1109,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 +1930,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 +1943,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 +1976,14 @@ class Shell {
|
||||
},
|
||||
}]),
|
||||
);
|
||||
items.push({
|
||||
label: "Close all apps",
|
||||
disabled: () => !this.windows.some(window => window.closeable),
|
||||
onSelect: (ctx) => {
|
||||
ctx.stack.pop();
|
||||
this.closeAllWindows();
|
||||
},
|
||||
});
|
||||
if (brightnessSetting.get() !== "auto") {
|
||||
items.push({
|
||||
label: "Brightness",
|
||||
|
||||
@@ -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
|
||||
|
||||
Reference in new issue
Block a user