| author | |
| committer | |
| log | 678f23a69943e3eef7171f452b44f2931d2ef21f |
| tree | 59beccd4ab4e7726f38c98f18b3716d8f99e4825 |
| parent | 77138cf33194a303adfbbd69cc93efa69f84245d |
| signature | Signed by PGP key B5690EEEBB952194 |
Co-authored-by: maria-rcks <254055478+maria-rcks@users.noreply.github.com>2 files changed, 6 insertions(+), 8 deletions(-)
apps/desktop/src/window/QuitHold.test.ts+3-3| ... | ... | @@ -368,14 +368,14 @@ describe("makeQuitShortcutHandler", () => { |
| 368 | 368 | expect(harness.notifications).toEqual([DOUBLE_CLICK_DOWN, UP, DOUBLE_CLICK_DOWN]); |
| 369 | 369 | }); |
| 370 | 370 | |
| 371 | it("does not treat two quick presses as a quit in hold mode", async () => { | |
| 371 | it("quits on a quick second press in hold mode", async () => { | |
| 372 | 372 | const harness = makeHarness(); |
| 373 | 373 | await harness.send(makeInput({})); |
| 374 | 374 | await harness.send(makeInput({ type: "keyUp" })); |
| 375 | 375 | vi.advanceTimersByTime(QUIT_DOUBLE_PRESS_MS - 100); |
| 376 | 376 | await harness.send(makeInput({})); |
| 377 | expect(harness.quit).not.toHaveBeenCalled(); | |
| 378 | expect(harness.notifications).toEqual([HOLD_DOWN, UP, HOLD_DOWN]); | |
| 377 | expect(harness.quit).toHaveBeenCalledTimes(1); | |
| 378 | expect(harness.notifications).toEqual([HOLD_DOWN, UP]); | |
| 379 | 379 | }); |
| 380 | 380 | |
| 381 | 381 | it("cancels the hold when another key interrupts it", async () => { |
apps/desktop/src/window/QuitHold.ts+3-5| ... | ... | @@ -181,11 +181,9 @@ export function makeQuitShortcutHandler( |
| 181 | 181 | quitNow(); |
| 182 | 182 | return; |
| 183 | 183 | } |
| 184 | if ( | |
| 185 | resolvedMode === "double-click" && | |
| 186 | previousPressAt !== 0 && | |
| 187 | now - previousPressAt <= QUIT_DOUBLE_PRESS_MS | |
| 188 | ) { | |
| 184 | // Keep a second press as an escape hatch when macOS misses the events | |
| 185 | // that would complete a hold. | |
| 186 | if (previousPressAt !== 0 && now - previousPressAt <= QUIT_DOUBLE_PRESS_MS) { | |
| 189 | 187 | quitNow(); |
| 190 | 188 | return; |
| 191 | 189 | } |