From 3acc0931d81543763c32ff5593cab746a725f31c Mon Sep 17 00:00:00 2001 From: lyswhut Date: Tue, 8 Mar 2022 17:19:34 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=85=A8=E5=B1=8F=E7=8A=B6?= =?UTF-8?q?=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- FAQ.md | 1 + publish/changeLog.md | 2 + src/common/ipcNames.js | 1 + src/main/index.js | 2 +- src/main/rendererEvents/trafficLight.js | 7 ++- src/renderer/App.vue | 45 ++++++++++++++++--- .../components/common/AudioVisualizer.vue | 31 +++++++++++-- .../components/core/Aside/ControlBtns.vue | 4 +- src/renderer/components/core/Aside/NavBar.vue | 24 ++++++++-- src/renderer/components/core/Aside/index.vue | 15 ++++++- .../components/core/PlayDetail/index.vue | 13 +++++- .../components/core/Toolbar/ControlBtns.vue | 4 +- .../components/core/Toolbar/index.vue | 15 ++++++- src/renderer/core/share/index.js | 1 + src/renderer/core/useApp/useEventListener.js | 14 ++++++ src/renderer/event/index.js | 4 -- .../views/setting/components/SettingBasic.vue | 5 ++- 17 files changed, 161 insertions(+), 27 deletions(-) diff --git a/FAQ.md b/FAQ.md index 62352458..1f3aa57b 100644 --- a/FAQ.md +++ b/FAQ.md @@ -30,6 +30,7 @@ - 在我的列表内可以使用`Ctrl + f`键打开搜索框进行列表内歌曲搜索,搜索框按`Esc`键可以关闭搜索框,搜索框内按上下方向键可以选择歌曲,按`回车`键跳转到已选歌曲,按`Ctrl + 回车`可以跳转并播放已选歌曲 - 在我的列表按住`Ctrl`键可以进入**列表拖动模式**,此时可以用鼠标拖动列表调整列表的位置 - 编辑列表名时按`Esc`键可以取消编辑 +- 按F11可以进入、退出全屏状态(v1.19.0新增) ## 歌曲无法试听与下载 diff --git a/publish/changeLog.md b/publish/changeLog.md index 367bd4a4..82afbc0c 100644 --- a/publish/changeLog.md +++ b/publish/changeLog.md @@ -2,6 +2,7 @@ - 新增对播放详情页歌词大小、是否缩放、对齐方式的设置,可以去设置-播放详情页设置查看 - 新增播放详情页通过歌词调整播放进度,默认关闭,需要到设置-播放详情页设置开启,开启后在播放详情页拖动歌词时将会出现跳转当前行歌词播放的按钮 +- 新增全屏状态,按F11可以进入、退出全屏状态 ### 优化 @@ -32,3 +33,4 @@ - 在我的列表内可以使用Ctrl+f键打开搜索框进行列表内歌曲搜索,搜索框按Esc键可以关闭搜索框,搜索框内按上下方向键可以选择歌曲,按回车键跳转到已选歌曲,按Ctrl+回车可以跳转并播放已选歌曲 - 在我的列表按住Ctrl键可以进入列表拖动模式,此时可以用鼠标拖动列表调整列表的位置 - 编辑列表名时按Esc键可以取消编辑 +- 按F11可以进入、退出全屏状态 diff --git a/src/common/ipcNames.js b/src/common/ipcNames.js index e5827046..1c44be15 100644 --- a/src/common/ipcNames.js +++ b/src/common/ipcNames.js @@ -4,6 +4,7 @@ const names = { close: 'close', min: 'min', max: 'max', + fullscreen: 'fullscreen', set_app_name: 'set_app_name', clear_cache: 'clear_cache', get_cache_size: 'get_cache_size', diff --git a/src/main/index.js b/src/main/index.js index 848e05a2..a4b0ec75 100644 --- a/src/main/index.js +++ b/src/main/index.js @@ -170,7 +170,7 @@ function createWindow() { // icon: path.join(global.__static, isWin ? 'icons/256x256.ico' : 'icons/512x512.png'), resizable: false, maximizable: false, - fullscreenable: false, + fullscreenable: true, show: false, webPreferences: { contextIsolation: false, diff --git a/src/main/rendererEvents/trafficLight.js b/src/main/rendererEvents/trafficLight.js index 1eb7590f..324a914c 100644 --- a/src/main/rendererEvents/trafficLight.js +++ b/src/main/rendererEvents/trafficLight.js @@ -1,5 +1,5 @@ const { app } = require('electron') -const { mainOn, NAMES: { mainWindow: ipcMainWindowNames } } = require('../../common/ipc') +const { mainOn, mainHandle, NAMES: { mainWindow: ipcMainWindowNames } } = require('../../common/ipc') mainOn(ipcMainWindowNames.min, event => { if (global.modules.mainWindow) { @@ -16,3 +16,8 @@ mainOn(ipcMainWindowNames.close, (event, isForce) => { global.isTrafficLightClose = true if (global.modules.mainWindow) global.modules.mainWindow.close() }) +mainHandle(ipcMainWindowNames.fullscreen, async(event, isFullscreen) => { + if (!global.modules.mainWindow) return false + await global.modules.mainWindow.setFullScreen(isFullscreen) + return isFullscreen +}) diff --git a/src/renderer/App.vue b/src/renderer/App.vue index 651b6168..ee90cf3e 100644 --- a/src/renderer/App.vue +++ b/src/renderer/App.vue @@ -16,11 +16,23 @@