From 7daa626d557ae1c4aafc5ea9744a34d164217fef Mon Sep 17 00:00:00 2001 From: lyswhut Date: Wed, 16 Nov 2022 13:23:06 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=92=AD=E6=94=BE=E8=AF=A6?= =?UTF-8?q?=E6=83=85=E9=A1=B5=E9=BC=A0=E6=A0=87=E4=B8=8D=E4=BC=9A=E8=87=AA?= =?UTF-8?q?=E5=8A=A8=E9=9A=90=E8=97=8F=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/modules/userApi/main.ts | 5 ++--- .../layout/PlayDetail/autoHideMounse.js | 18 +++++++++--------- 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/src/main/modules/userApi/main.ts b/src/main/modules/userApi/main.ts index f4747d19..fe4a8476 100644 --- a/src/main/modules/userApi/main.ts +++ b/src/main/modules/userApi/main.ts @@ -72,9 +72,8 @@ export const createWindow = async(userApi: LX.UserApi.UserApiInfo) => { }) } browserWindow.webContents.session.setPermissionRequestHandler((webContents, permission, resolve) => { - if (webContents === browserWindow?.webContents) return resolve(true) - - resolve(false) + if (webContents === browserWindow?.webContents) return resolve(false) + resolve(true) }) browserWindow.webContents.setWindowOpenHandler(() => { return { action: 'deny' } diff --git a/src/renderer/components/layout/PlayDetail/autoHideMounse.js b/src/renderer/components/layout/PlayDetail/autoHideMounse.js index f82755e1..7aa27100 100644 --- a/src/renderer/components/layout/PlayDetail/autoHideMounse.js +++ b/src/renderer/components/layout/PlayDetail/autoHideMounse.js @@ -1,7 +1,7 @@ import { debounce } from '@common/utils/common' let isAutoHide = false let isLockedPointer = false -let dom = null +// let dom = null let event = null let isMouseDown = false @@ -16,7 +16,7 @@ const lockPointer = () => { if (!isAutoHide || isMouseDown) return if (event && isControl(document.elementFromPoint(event.clientX, event.clientY))) return - dom.requestPointerLock() + document.body.requestPointerLock() isLockedPointer = true } const unLockPointer = () => { @@ -43,11 +43,11 @@ const handleMouseUp = () => { export const registerAutoHideMounse = () => { if (isAutoHide) return - if (!dom) dom = document.getElementById('root') + // if (!dom) dom = document.getElementById('root') isAutoHide = true - document.addEventListener('mousemove', handleMouseMove) - document.addEventListener('mousedown', handleMouseDown) - document.addEventListener('mouseup', handleMouseUp) + document.body.addEventListener('mousemove', handleMouseMove) + document.body.addEventListener('mousedown', handleMouseDown) + document.body.addEventListener('mouseup', handleMouseUp) startTimeout() } @@ -55,8 +55,8 @@ export const unregisterAutoHideMounse = () => { if (!isAutoHide) return isAutoHide = false // console.log(dom) - dom.removeEventListener('mousemove', handleMouseMove) - dom.removeEventListener('mousedown', handleMouseDown) - dom.removeEventListener('mouseup', handleMouseUp) + document.body.removeEventListener('mousemove', handleMouseMove) + document.body.removeEventListener('mousedown', handleMouseDown) + document.body.removeEventListener('mouseup', handleMouseUp) unLockPointer() }