修复初始设置的桌面歌词窗口没有完全居右下角的问题
parent
95590dd07f
commit
c8210e0516
|
@ -1,4 +1,4 @@
|
||||||
|
|
||||||
### 修复
|
### 修复
|
||||||
|
|
||||||
- 修复列表备份文件存在异常歌曲信息时无法导入的问题
|
- 修复初始设置的桌面歌词窗口没有完全居右下角的问题
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
import { join } from 'path'
|
import { join } from 'path'
|
||||||
import { BrowserWindow } from 'electron'
|
import { BrowserWindow } from 'electron'
|
||||||
import { debounce, isLinux } from '@common/utils'
|
import { debounce, isLinux } from '@common/utils'
|
||||||
import { getLyricWindowBounds } from './utils'
|
import { getLyricWindowBounds, offset } from './utils'
|
||||||
import { mainSend } from '@common/mainIpc'
|
import { mainSend } from '@common/mainIpc'
|
||||||
import { encodePath } from '@common/utils/electron'
|
import { encodePath } from '@common/utils/electron'
|
||||||
|
|
||||||
|
@ -85,8 +85,8 @@ export const createWindow = () => {
|
||||||
let isShowTaskbar = global.lx.appSetting['desktopLyric.isShowTaskbar']
|
let isShowTaskbar = global.lx.appSetting['desktopLyric.isShowTaskbar']
|
||||||
let { width: screenWidth, height: screenHeight } = global.envParams.workAreaSize
|
let { width: screenWidth, height: screenHeight } = global.envParams.workAreaSize
|
||||||
if (x == null || y == null) {
|
if (x == null || y == null) {
|
||||||
x = screenWidth - width
|
x = screenWidth - width + offset
|
||||||
y = screenHeight - height
|
y = screenHeight - height + offset
|
||||||
}
|
}
|
||||||
if (isLockScreen) {
|
if (isLockScreen) {
|
||||||
let bounds = getLyricWindowBounds({ x, y, width, height }, { x: null, y: 0, w: width, h: height })
|
let bounds = getLyricWindowBounds({ x, y, width, height }, { x: null, y: 0, w: width, h: height })
|
||||||
|
|
|
@ -3,7 +3,7 @@ let winX
|
||||||
let winY
|
let winY
|
||||||
let wasW
|
let wasW
|
||||||
let wasH
|
let wasH
|
||||||
let offset = 8
|
export const offset = 8
|
||||||
let minWidth = 80
|
let minWidth = 80
|
||||||
let minHeight = 50
|
let minHeight = 50
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue