Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/client/HelpModal.ts
Original file line number Diff line number Diff line change
Expand Up @@ -285,7 +285,7 @@ export class HelpModal extends BaseModal {
<tr class="hover:bg-white/5 transition-colors">
<td class="py-3 pl-4 border-b border-white/5">
<div class="inline-flex items-center gap-2">
${this.renderKey(keybinds.modifierKey)}
${this.renderKey(keybinds.buildMenuModifier)}
<span class="text-white/40 font-bold">+</span>
<div
class="w-5 h-8 border border-white/40 rounded-full relative"
Expand All @@ -306,7 +306,7 @@ export class HelpModal extends BaseModal {
<tr class="hover:bg-white/5 transition-colors">
<td class="py-3 pl-4 border-b border-white/5">
<div class="inline-flex items-center gap-2">
${this.renderKey(keybinds.altKey)}
${this.renderKey(keybinds.emojiMenuModifier)}
<span class="text-white/40 font-bold">+</span>
<div
class="w-5 h-8 border border-white/40 rounded-full relative"
Expand Down
41 changes: 4 additions & 37 deletions src/client/InputHandler.ts
Original file line number Diff line number Diff line change
Expand Up @@ -436,6 +436,8 @@ export class InputHandler {
"ControlLeft",
"ControlRight",
this.keybinds.shiftKey,
this.keybinds.emojiMenuModifier,
this.keybinds.buildMenuModifier,
].includes(e.code)
) {
this.activeKeys.add(e.code);
Expand Down Expand Up @@ -689,13 +691,12 @@ export class InputHandler {
this.eventBus.emit(new WarshipSelectionBoxCancelEvent());
}
}

if (this.isModifierKeyPressed(event)) {
if (this.activeKeys.has(this.keybinds.buildMenuModifier)) {
this.suppressNextTap = false;
this.eventBus.emit(new ShowBuildMenuEvent(event.clientX, event.clientY));
return;
}
if (this.isAltKeyPressed(event)) {
if (this.activeKeys.has(this.keybinds.emojiMenuModifier)) {
this.suppressNextTap = false;
this.eventBus.emit(new ShowEmojiMenuEvent(event.clientX, event.clientY));
return;
Expand Down Expand Up @@ -992,23 +993,6 @@ export class InputHandler {
this.activeKeys.clear();
}

isModifierKeyPressed(event: PointerEvent): boolean {
return (
((this.keybinds.modifierKey === "AltLeft" ||
this.keybinds.modifierKey === "AltRight") &&
event.altKey) ||
((this.keybinds.modifierKey === "ControlLeft" ||
this.keybinds.modifierKey === "ControlRight") &&
event.ctrlKey) ||
((this.keybinds.modifierKey === "ShiftLeft" ||
this.keybinds.modifierKey === "ShiftRight") &&
event.shiftKey) ||
((this.keybinds.modifierKey === "MetaLeft" ||
this.keybinds.modifierKey === "MetaRight") &&
event.metaKey)
);
}

private isAltKeyHeld(event: KeyboardEvent): boolean {
if (
this.keybinds.altKey === "AltLeft" ||
Expand Down Expand Up @@ -1036,21 +1020,4 @@ export class InputHandler {
}
return false;
}

isAltKeyPressed(event: PointerEvent): boolean {
return (
((this.keybinds.altKey === "AltLeft" ||
this.keybinds.altKey === "AltRight") &&
event.altKey) ||
((this.keybinds.altKey === "ControlLeft" ||
this.keybinds.altKey === "ControlRight") &&
event.ctrlKey) ||
((this.keybinds.altKey === "ShiftLeft" ||
this.keybinds.altKey === "ShiftRight") &&
event.shiftKey) ||
((this.keybinds.altKey === "MetaLeft" ||
this.keybinds.altKey === "MetaRight") &&
event.metaKey)
);
}
}
16 changes: 8 additions & 8 deletions src/client/UserSettingModal.ts
Original file line number Diff line number Diff line change
Expand Up @@ -505,22 +505,22 @@ export class UserSettingModal extends BaseModal {
</h2>

<setting-keybind
action="modifierKey"
action="buildMenuModifier"
label=${translateText("user_setting.build_menu_modifier")}
description=${translateText("user_setting.build_menu_modifier_desc")}
.defaultKey=${this.defaultKeybinds.modifierKey}
.value=${this.getKeyValue("modifierKey")}
.display=${this.getKeyChar("modifierKey")}
.defaultKey=${this.defaultKeybinds.buildMenuModifier}
.value=${this.getKeyValue("buildMenuModifier")}
.display=${this.getKeyChar("buildMenuModifier")}
@change=${this.handleKeybindChange}
></setting-keybind>

<setting-keybind
action="altKey"
action="emojiMenuModifier"
label=${translateText("user_setting.emoji_menu_modifier")}
description=${translateText("user_setting.emoji_menu_modifier_desc")}
.defaultKey=${this.defaultKeybinds.altKey}
.value=${this.getKeyValue("altKey")}
.display=${this.getKeyChar("altKey")}
.defaultKey=${this.defaultKeybinds.emojiMenuModifier}
.value=${this.getKeyValue("emojiMenuModifier")}
.display=${this.getKeyChar("emojiMenuModifier")}
@change=${this.handleKeybindChange}
></setting-keybind>

Expand Down
4 changes: 2 additions & 2 deletions src/core/game/UserSettings.ts
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@ export function getDefaultKeybinds(isMac: boolean): Record<string, string> {
moveLeft: "KeyA",
moveDown: "KeyS",
moveRight: "KeyD",
modifierKey: isMac ? "MetaLeft" : "ControlLeft",
altKey: "AltLeft",
buildMenuModifier: isMac ? "MetaLeft" : "ControlLeft",
emojiMenuModifier: "AltLeft",
shiftKey: "ShiftLeft",
resetGfx: "KeyR",
selectAllWarships: "KeyF",
Expand Down
Loading