fix stuck screen on unknwo button
parent
c7d26ac9bc
commit
fcdbf2b5c0
|
@ -18,12 +18,12 @@ export default class GamepadBindingUiHandler extends AbstractBindingUiHandler {
|
||||||
const blacklist = [12, 13, 14, 15]; // d-pad buttons are blacklisted.
|
const blacklist = [12, 13, 14, 15]; // d-pad buttons are blacklisted.
|
||||||
// Check conditions before processing the button press.
|
// Check conditions before processing the button press.
|
||||||
if (!this.listening || pad.id !== this.scene.inputController?.chosenGamepad || blacklist.includes(button.index) || this.buttonPressed !== null) return;
|
if (!this.listening || pad.id !== this.scene.inputController?.chosenGamepad || blacklist.includes(button.index) || this.buttonPressed !== null) return;
|
||||||
this.buttonPressed = button.index;
|
|
||||||
const activeConfig = this.scene.inputController.getActiveConfig();
|
const activeConfig = this.scene.inputController.getActiveConfig();
|
||||||
const type = activeConfig.padType
|
const type = activeConfig.padType
|
||||||
const key = getKeyFromMapping(activeConfig, this.buttonPressed);
|
const key = getKeyFromMapping(activeConfig, button.index);
|
||||||
const buttonIcon = activeConfig.ogIcons[key];
|
const buttonIcon = activeConfig.ogIcons[key];
|
||||||
if (!buttonIcon) return;
|
if (!buttonIcon) return;
|
||||||
|
this.buttonPressed = button.index;
|
||||||
const assignedButtonIcon = getKeyAndActionFromCurrentKeysWithSettingName(activeConfig, this.target)?.icon;
|
const assignedButtonIcon = getKeyAndActionFromCurrentKeysWithSettingName(activeConfig, this.target)?.icon;
|
||||||
this.onInputDown(buttonIcon, assignedButtonIcon, type);
|
this.onInputDown(buttonIcon, assignedButtonIcon, type);
|
||||||
}
|
}
|
||||||
|
|
|
@ -18,11 +18,11 @@ export default class KeyboardBindingUiHandler extends AbstractBindingUiHandler {
|
||||||
const key = event.keyCode;
|
const key = event.keyCode;
|
||||||
// // Check conditions before processing the button press.
|
// // Check conditions before processing the button press.
|
||||||
if (!this.listening || this.buttonPressed !== null) return;
|
if (!this.listening || this.buttonPressed !== null) return;
|
||||||
this.buttonPressed = key;
|
|
||||||
const activeConfig = this.scene.inputController.getActiveKeyboardConfig();
|
const activeConfig = this.scene.inputController.getActiveKeyboardConfig();
|
||||||
const _key = getKeyFromMapping(activeConfig, key);
|
const _key = getKeyFromMapping(activeConfig, key);
|
||||||
const buttonIcon = activeConfig.ogIcons[_key];
|
const buttonIcon = activeConfig.ogIcons[_key];
|
||||||
if (!buttonIcon) return;
|
if (!buttonIcon) return;
|
||||||
|
this.buttonPressed = key;
|
||||||
const assignedButtonIcon = getKeyAndActionFromCurrentKeysWithSettingName(activeConfig, this.target)?.icon;
|
const assignedButtonIcon = getKeyAndActionFromCurrentKeysWithSettingName(activeConfig, this.target)?.icon;
|
||||||
this.onInputDown(buttonIcon, assignedButtonIcon, 'keyboard');
|
this.onInputDown(buttonIcon, assignedButtonIcon, 'keyboard');
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue