Shikong/scrcpy-mask
1
0
Fork 0
mirror of https://github.com/AkiChase/scrcpy-mask synced 2025-02-23 07:22:17 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(hotkey): mouse wheel hotkey not work as expected

Browse Source
This commit is contained in:
AkiChase 2024-05-03 18:43:25 +08:00
parent af4273d2a6
commit 70bdd78355
2 changed files with 21 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/components/keyboard/KeyBoard.vue
View File

@ -258,8 +258,7 @@ onBeforeRouteLeave(() => {
resolve(true); resolve(true);
}, },
}); });
} } else resolve(true);
resolve(true);
}); });
}); });
</script> </script>

24
src/hotkey.ts
View File

@ -51,8 +51,8 @@ function clientPosToSkillOffset(
// The center of the game display is higher than the center of the mask // The center of the game display is higher than the center of the mask
clientPos.y -= maskSizeH * 0.066; clientPos.y -= maskSizeH * 0.066;
// w450 : h315 = 100 : 70, so the true offsetX is 0.7 * cOffsetX // w450 : h315 = 100 : 70, so the true offsetX is 0.7 * cOffsetX
const cOffsetX = (clientPos.x - 70 - centerX)*0.7; const cOffsetX = (clientPos.x - 70 - centerX) * 0.7;
const cOffsetY = clientPos.y - 30 - centerY; const cOffsetY = clientPos.y - 30 - centerY;
const offsetD = Math.sqrt(cOffsetX ** 2 + cOffsetY ** 2); const offsetD = Math.sqrt(cOffsetX ** 2 + cOffsetY ** 2);
if (offsetD == 0) { if (offsetD == 0) {
@ -731,11 +731,27 @@ function handleMouseWheel(event: WheelEvent) {
if (event.deltaY > 0 && event.timeStamp - lastWheelDownTime > 50) { if (event.deltaY > 0 && event.timeStamp - lastWheelDownTime > 50) {
lastWheelDownTime = event.timeStamp; lastWheelDownTime = event.timeStamp;
// WheelDown // WheelDown
downKeyCBMap.get("WheelDown")?.(); if (downKeyMap.has("WheelDown")) {
if (!downKeyMap.get("WheelDown")) {
downKeyMap.set("WheelDown", true);
downKeyCBMap.get("WheelDown")?.();
} else {
downKeyMap.set("WheelDown", false);
upKeyCBMap.get("WheelDown")?.();
}
}
} else if (event.deltaY < 0 && event.timeStamp - lastWheelUpTime > 50) { } else if (event.deltaY < 0 && event.timeStamp - lastWheelUpTime > 50) {
lastWheelUpTime = event.timeStamp; lastWheelUpTime = event.timeStamp;
// WheelUp // WheelUp
downKeyCBMap.get("WheelUp")?.(); if (downKeyMap.has("WheelUp")) {
if (!downKeyMap.get("WheelUp")) {
downKeyMap.set("WheelUp", true);
downKeyCBMap.get("WheelUp")?.();
} else {
downKeyMap.set("WheelUp", false);
upKeyCBMap.get("WheelUp")?.();
}
}
} }
} }