From ac1b202f44681ead624577f0c9b42bc42d140d73 Mon Sep 17 00:00:00 2001 From: layyback <505187749@qq.com> Date: Fri, 10 Mar 2023 15:51:53 +0800 Subject: [PATCH] :spakles: close with esc --- src/main/common/api.ts | 9 +++++++-- src/main/index.ts | 4 ++-- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/src/main/common/api.ts b/src/main/common/api.ts index 1c9083d..f9315b2 100644 --- a/src/main/common/api.ts +++ b/src/main/common/api.ts @@ -13,7 +13,7 @@ import fs from "fs"; import { LocalDb } from "@/core"; import plist from "plist"; import { DECODE_KEY } from "@/common/constans/main"; - +import mainInstance from "../index"; const runnerInstance = runner(); const detachInstance = detach(); const dbInstance = new LocalDb(app.getPath("userData")); @@ -44,8 +44,13 @@ class API { if (input.type !== "keyDown") return; if (!(input.meta || input.control || input.shift || input.alt)) { if (input.key === "Escape") { - this.removePlugin(null, window); + if (this.currentPlugin) { + this.removePlugin(null, window); + } else { + mainInstance.windowCreator.getWindow().hide(); + } } + return; } }; diff --git a/src/main/index.ts b/src/main/index.ts index 66b2683..d773a7b 100644 --- a/src/main/index.ts +++ b/src/main/index.ts @@ -19,7 +19,7 @@ import "../common/utils/localConfig"; import registerySystemPlugin from "./common/registerySystemPlugin"; class App { - private windowCreator: { init: () => void; getWindow: () => BrowserWindow }; + public windowCreator: { init: () => void; getWindow: () => BrowserWindow }; private systemPlugins: any; constructor() { @@ -122,4 +122,4 @@ class App { } } -new App(); +export default new App();