diff --git a/app/ui/shell/shell.ts b/app/ui/shell/shell.ts index e614c33d..7d378764 100644 --- a/app/ui/shell/shell.ts +++ b/app/ui/shell/shell.ts @@ -2059,7 +2059,8 @@ class Shell { }, })); } - if (foreground.closeable && this.switcherWindows().filter(window => window.closeable).length > 1) { + const movableWindows = this.switcherWindows().filter(window => window.closeable); + if (movableWindows.length > 1 && movableWindows.includes(foreground)) { items.push({ label: "Move in app switcher", description: "Choose this open window's position in the app switcher.", diff --git a/docs/branches.md b/docs/branches.md index bc0fae05..bb15c432 100644 --- a/docs/branches.md +++ b/docs/branches.md @@ -2,7 +2,7 @@ `main` mirrors `jimrandomh/faceclaw` at `6df52021c8e6c8fd843bc8d5652851e8c0fc6ab8`. It tracks `upstream/main`; Gitea is the push remote `origin` and uses `main` as its default branch. -Each feature branch has one commit on this main, without unrelated features or environment setup. All PRs target `main`. +Each feature branch starts from this main and groups related changes, without unrelated features or environment setup. All PRs target `main`. | Group | Branch | PR | Independent JS tests | | --- | --- | --- | --- | @@ -15,7 +15,7 @@ Each feature branch has one commit on this main, without unrelated features or e | feat: language selection for OpenAI and on-device Whisper | `feat/whisper-languages` | [#7](https://git.undefined-dev.fr/Blendman974/faceclaw/pulls/7) | 1067 passed, 2 skipped | | feat: configurable app and system menu hold gestures | `feat/menu-gesture-preference` | [#8](https://git.undefined-dev.fr/Blendman974/faceclaw/pulls/8) | 1072 passed, 2 skipped | -| feat: editable launcher folders and custom icon layout | `feat/launcher-layout` | [#9](https://git.undefined-dev.fr/Blendman974/faceclaw/pulls/9) | 1073 passed, 2 skipped | +| feat: editable launcher folders, icon layout and open-window order | `feat/launcher-layout` | [#9](https://git.undefined-dev.fr/Blendman974/faceclaw/pulls/9) | 1080 passed, 2 skipped | All independent branches also passed `tsc --noEmit`. The head-up branch received a final import-only cleanup and was typechecked/linted again. diff --git a/docs/validation-launcher-layout.md b/docs/validation-launcher-layout.md index c0131b9e..a30ba574 100644 --- a/docs/validation-launcher-layout.md +++ b/docs/validation-launcher-layout.md @@ -23,3 +23,5 @@ This arranges existing open windows independently of the launcher's Alphabetical Software tests cover both directions, menu integration, duplicate titles, captured source IDs, cancellation, removed source/destination, temporary and pinned windows, appending/replacing windows, foreground identity and MRU close behavior. Hardware checks remain pending for ring/watch navigation in the position picker and left/right/bottom/popup switcher placements. Independent branch after adding open-window ordering: 1080 JavaScript tests passed, 2 skipped; TypeScript and changed-source lint passed. + +Combined validation after open-window ordering: 1124 JavaScript tests passed, 2 skipped, 0 failed; TypeScript and changed-source lint passed. The brightness-picker test now selects its target row explicitly, accommodating the independently requested default Close current app selection. diff --git a/tests/switcher-order.test.cjs b/tests/switcher-order.test.cjs index b28c541a..84ad1ff2 100644 --- a/tests/switcher-order.test.cjs +++ b/tests/switcher-order.test.cjs @@ -118,6 +118,9 @@ test('temporary status windows and pinned slots stay fixed, including selected s assert.deepEqual(h.ids(), ['launcher', 'terminal:two', 'notifications:temporary', 'another-pinned', 'calendar', 'terminal:one']); assert.equal(h.s.foregroundWindow(), hidden); assert.equal(h.s.selectedStatus.host, hidden); + h.s.openEscapeMenu(); + assert.ok(!h.menu().items.some(item => item.label === 'Move in app switcher')); + h.s.stack.pop(); h.s.openSwitcherMoveMenu(h.first.windowId); assert.deepEqual(Array.from(h.menu().items, item => item.label), ['1. Terminal', '2. Calendar', '3. Terminal']); });