diff --git a/publish/changeLog.md b/publish/changeLog.md index 95b40286..bc0282d1 100644 --- a/publish/changeLog.md +++ b/publish/changeLog.md @@ -1,3 +1,3 @@ -#### 修复 +#### 新增 -- 兼容旧版酷我源搜索列表过滤128k音质的bug(注:0.8.1版本仅修复了酷我源的歌曲过滤问题,该修复仅对以后添加的歌曲有效,如果是之前添加的歌曲仍会出现这个问题,现修复对之前旧列表数据的兼容处理) +- 新增窗口大小设置,若觉得软件窗口小可以到设置页调大点 diff --git a/src/common/config.js b/src/common/config.js new file mode 100644 index 00000000..7afc83f3 --- /dev/null +++ b/src/common/config.js @@ -0,0 +1,25 @@ +module.exports = { + windowSizeList: [ + { + id: 1, + name: '小', + width: 920, + height: 590, + tabList: '645px', + }, + { + id: 2, + name: '中', + width: 1012, + height: 650, + tabList: '719px', + }, + { + id: 3, + name: '大', + width: 1104, + height: 708, + tabList: '792px', + }, + ], +} diff --git a/src/main/events/restartWindow.js b/src/main/events/restartWindow.js new file mode 100644 index 00000000..3d64be2d --- /dev/null +++ b/src/main/events/restartWindow.js @@ -0,0 +1,13 @@ +const { mainOn } = require('../../common/icp') + + +mainOn('restartWindow', (event, name) => { + console.log(name) + switch (name) { + case 'main': + default: + + break + } +}) + diff --git a/src/main/index.js b/src/main/index.js index 111167e2..7e33b713 100644 --- a/src/main/index.js +++ b/src/main/index.js @@ -18,6 +18,7 @@ app.on('second-instance', (event, argv, cwd) => { require('./events') const autoUpdate = require('./utils/autoUpdate') const { isLinux, isMac } = require('../common/utils') +const { getWindowSizeInfo } = require('./utils') const isDev = process.env.NODE_ENV !== 'production' @@ -39,13 +40,14 @@ if (isDev) { } function createWindow() { + let windowSizeInfo = getWindowSizeInfo() /** * Initial window options */ mainWindow = global.mainWindow = new BrowserWindow({ - height: 590, + height: windowSizeInfo.height, useContentSize: true, - width: 920, + width: windowSizeInfo.width, frame: false, transparent: !isLinux, // icon: path.join(global.__static, isWin ? 'icons/256x256.ico' : 'icons/512x512.png'), diff --git a/src/main/utils/index.js b/src/main/utils/index.js new file mode 100644 index 00000000..edea2bda --- /dev/null +++ b/src/main/utils/index.js @@ -0,0 +1,8 @@ +const Store = require('electron-store') +const { windowSizeList } = require('../../common/config') + +exports.getWindowSizeInfo = () => { + let electronStore = new Store() + const { windowSizeId = 1 } = electronStore.get('setting') + return windowSizeList.find(i => i.id === windowSizeId) || windowSizeList[0] +} diff --git a/src/renderer/assets/styles/variables.less b/src/renderer/assets/styles/variables.less index 8d421c8e..75351643 100644 --- a/src/renderer/assets/styles/variables.less +++ b/src/renderer/assets/styles/variables.less @@ -413,7 +413,7 @@ // Width -@width-app-left: 180px; +@width-app-left: 20%; // Height @height-toolbar: 50px; diff --git a/src/renderer/components/core/Aside.vue b/src/renderer/components/core/Aside.vue index f97a65d5..3ca3bb0e 100644 --- a/src/renderer/components/core/Aside.vue +++ b/src/renderer/components/core/Aside.vue @@ -68,8 +68,8 @@ export default { } .logo { box-sizing: border-box; - padding: 20px; - height: 100px; + padding: 12% 13%; + // height: 120px; color: @color-theme-font; flex: none; } diff --git a/src/renderer/components/core/Player.vue b/src/renderer/components/core/Player.vue index 6bdc43c7..a016914c 100644 --- a/src/renderer/components/core/Player.vue +++ b/src/renderer/components/core/Player.vue @@ -88,8 +88,6 @@ export default { msDownX: 0, msDownVolume: 0, }, - handleVolumeMsMoveFn: null, - handleVolumeMsUpFn: null, } }, computed: { @@ -125,12 +123,14 @@ export default { this.setVolume(volume) }, 300) - document.addEventListener('mousemove', this.handleVolumeMsMoveFn = this.handleVolumeMsMove.bind(this)) - document.addEventListener('mouseup', this.handleVolumeMsUpFn = this.handleVolumeMsUp.bind(this)) + document.addEventListener('mousemove', this.handleVolumeMsMove) + document.addEventListener('mouseup', this.handleVolumeMsUp) + window.addEventListener('resize', this.handleResize) }, beforeDestroy() { - document.removeEventListener('mousemove', this.handleVolumeMsMoveFn) - document.removeEventListener('mouseup', this.handleVolumeMsUpFn) + document.removeEventListener('mousemove', this.handleVolumeMsMove) + document.removeEventListener('mouseup', this.handleVolumeMsUp) + window.removeEventListener('resize', this.handleResize) }, watch: { changePlay(n) { @@ -489,6 +489,9 @@ export default { handleCopy(text) { clipboardWriteText(text) }, + handleResize() { + this.setProgessWidth() + }, }, } diff --git a/src/renderer/components/material/TagList.vue b/src/renderer/components/material/TagList.vue index 9c28abd6..c6ba5612 100644 --- a/src/renderer/components/material/TagList.vue +++ b/src/renderer/components/material/TagList.vue @@ -5,7 +5,7 @@ div(:class="$style.icon") svg(version='1.1' xmlns='http://www.w3.org/2000/svg' xlink='http://www.w3.org/1999/xlink' height='100%' viewBox='0 0 451.847 451.847' space='preserve') use(xlink:href='#icon-down') - div.scroll(:class="$style.list" @click.stop ref="dom_list") + div.scroll(:class="$style.list" :style="{ width: listStyle }" @click.stop ref="dom_list") div(:class="$style.tag" @click="handleClick(null)") 默认 dl(v-for="type in list") dt(:class="$style.type") {{type.name}} @@ -14,6 +14,7 @@ @@ -549,6 +564,19 @@ export default { } +.btn-content { + display: inline-block; + transition: @transition-theme; + transition-property: opacity, transform; + opacity: 1; + transform: scale(1); + + &.hide { + opacity: 0; + transform: scale(0); + } +} + .gap-left { + .gap-left { margin-left: 20px;