Mascali
/
shapez
1
0
Fork 0
Code Issues Pull Requests Actions Projects Releases Wiki Activity

change MouseEvent keyCode to event.button + 1

This commit is contained in:
Dimava 2020-05-30 11:11:26 +03:00
parent 79dcd79734
commit d5d615bfd3
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/js/core/input_distributor.js
View File

@ -185,10 +185,10 @@ export class InputDistributor {
* @param {KeyboardEvent | MouseEvent} event
*/
handleKeydown(event) {
const keyCode = event instanceof MouseEvent ? event.button : event.keyCode;
const keyCode = event instanceof MouseEvent ? event.button + 1 : event.keyCode;
if (
keyCode === 3 ||
keyCode === 4 || // MB3 / MB4
keyCode === 4 || // MB4
keyCode === 5 || // MB5
keyCode === 9 || // TAB
keyCode === 16 || // SHIFT
keyCode === 17 || // CTRL
@ -225,7 +225,7 @@ export class InputDistributor {
* @param {KeyboardEvent | MouseEvent} event
*/
handleKeyup(event) {
const keyCode = event instanceof MouseEvent ? event.button : event.keyCode;
const keyCode = event instanceof MouseEvent ? event.button + 1 : event.keyCode;
this.keysDown.delete(keyCode);
this.forwardToReceiver("keyup", {

10
src/js/game/key_action_mapper.js
View File

@ -86,15 +86,15 @@ for (const categoryId in KEYMAPPINGS) {
*/
export function getStringForKeyCode(code) {
switch (code) {
case 0:
return "LMB";
case 1:
return "MMB";
return "LMB";
case 2:
return "RMB";
return "MMB";
case 3:
return "MB4";
return "RMB";
case 4:
return "MB4";
case 5:
return "MB5";
case 8:
return "⌫";

2
src/js/states/keybindings.js
View File

@ -127,7 +127,7 @@ export class KeybindingsState extends TextualGameState {
return;
}
event.preventDefault();
const keyCode = event.button;
const keyCode = event.button + 1;
this.app.settings.updateKeybindingOverride(id, keyCode);