1
0
mirror of https://github.com/tobspr/shapez.io.git synced 2025-06-13 13:04:03 +00:00

Revert "Filter out shifted key presses."

This reverts commit 7dfe867de5.
This commit is contained in:
FatCatX 2021-06-04 19:31:32 -07:00
parent c977c339d8
commit 4b04779463
4 changed files with 7 additions and 12 deletions

View File

@ -210,7 +210,6 @@ export class InputDistributor {
this.forwardToReceiver("keydown", {
keyCode: keyCode,
shift: event.shiftKey,
ctrl: event.ctrlKey,
alt: event.altKey,
initial: isInitial,
event,
@ -237,7 +236,6 @@ export class InputDistributor {
this.forwardToReceiver("keyup", {
keyCode: keyCode,
shift: event.shiftKey,
ctrl: event.ctrlKey,
alt: event.altKey,
});
}

View File

@ -89,10 +89,9 @@ export class Dialog {
* @param {object} param0
* @param {number} param0.keyCode
* @param {boolean} param0.shift
* @param {boolean} param0.ctrl
* @param {boolean} param0.alt
*/
handleKeydown({ keyCode, shift, ctrl, alt }) {
handleKeydown({ keyCode, shift, alt }) {
if (keyCode === kbEnter && this.enterHandler) {
this.internalButtonHandler(this.enterHandler);
return STOP_PROPAGATION;
@ -319,7 +318,7 @@ export class DialogOptionChooser extends Dialog {
<div class='option ${value === options.active ? "active" : ""} ${
iconPrefix ? "hasIcon" : ""
}' data-optionvalue='${value}'>
${iconHtml}
${iconHtml}
<span class='title'>${text}</span>
${descHtml}
</div>

View File

@ -458,18 +458,17 @@ export class KeyActionMapper {
* @param {object} param0
* @param {number} param0.keyCode
* @param {boolean} param0.shift
* @param {boolean} param0.ctrl
* @param {boolean} param0.alt
* @param {boolean=} param0.initial
*/
handleKeydown({ keyCode, shift, ctrl, alt, initial }) {
handleKeydown({ keyCode, shift, alt, initial }) {
let stop = false;
// Find mapping
for (const key in this.keybindings) {
/** @type {Keybinding} */
const binding = this.keybindings[key];
if (binding.keyCode === keyCode && !shift && !ctrl && !alt && (initial || binding.repeated)) {
if (binding.keyCode === keyCode && (initial || binding.repeated)) {
/** @type {Signal} */
const signal = this.keybindings[key].signal;
if (signal.dispatch() === STOP_PROPAGATION) {
@ -488,10 +487,9 @@ export class KeyActionMapper {
* @param {object} param0
* @param {number} param0.keyCode
* @param {boolean} param0.shift
* @param {boolean} param0.ctrl
* @param {boolean} param0.alt
*/
handleKeyup({ keyCode, shift, ctrl, alt }) {
handleKeyup({ keyCode, shift, alt }) {
// Empty
}

View File

@ -19,7 +19,7 @@ export class KeybindingsState extends TextualGameState {
<div class="topEntries">
<span class="hint">${T.keybindings.hint}</span>
<button class="styledButton resetBindings">${T.keybindings.resetKeybindings}</button>
</div>
<div class="keybindings">
@ -89,7 +89,7 @@ export class KeybindingsState extends TextualGameState {
type: "info",
});
dialog.inputReciever.keydown.add(({ keyCode, shift, ctrl, alt, event }) => {
dialog.inputReciever.keydown.add(({ keyCode, shift, alt, event }) => {
if (keyCode === 27) {
this.dialogs.closeDialog(dialog);
return;