From e5d2e089f46c879dabeb6fee4d01e2dcd40dda8e Mon Sep 17 00:00:00 2001 From: lyswhut Date: Thu, 19 May 2022 14:57:42 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9C=A8=E5=85=A8=E5=B1=8F=E7=8A=B6=E6=80=81?= =?UTF-8?q?=E4=B8=8B=E4=BD=BF=E7=94=A8`Esc`=E9=94=AE=E5=8F=AF=E4=BB=A5?= =?UTF-8?q?=E9=80=80=E5=87=BA=E5=85=A8=E5=B1=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- publish/changeLog.md | 1 + src/renderer/core/useApp/useEventListener.js | 11 ++++++++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/publish/changeLog.md b/publish/changeLog.md index e8399391..cf53751b 100644 --- a/publish/changeLog.md +++ b/publish/changeLog.md @@ -7,6 +7,7 @@ - 同时删除一首歌以上时将需要二次确认删除 - 禁用透明窗口时右侧不再偏移5px距离(在win7、Ubuntu等系统上测试发现不偏移也不影响滚动条的拖动了) - 删除未下载完成的任务时,只同时尝试删除已有下载进度的本地文件 +- 在全屏状态下使用`Esc`键可以退出全屏(#827) ### 修复 diff --git a/src/renderer/core/useApp/useEventListener.js b/src/renderer/core/useApp/useEventListener.js index 4de6eddc..859bb6e9 100644 --- a/src/renderer/core/useApp/useEventListener.js +++ b/src/renderer/core/useApp/useEventListener.js @@ -14,9 +14,18 @@ import { const handle_key_esc_down = ({ event }) => { if (event.repeat) return - if (event.target.tagName != 'INPUT' || event.target.classList.contains('ignore-esc')) return + if (event.target.tagName != 'INPUT' || event.target.classList.contains('ignore-esc')) { + if (isFullscreen.value) { + event.lx_handled = true + rendererInvoke(NAMES.mainWindow.fullscreen, false).then(fullscreen => { + isFullscreen.value = fullscreen + }) + } + return + } event.target.value = '' event.target.blur() + event.lx_handled = true } const handleBodyClick = event => { if (event.target.tagName != 'A') return