Skip to content

fix(app/frontend): alt gr treated wrong #7604

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
IMB11 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix(app/frontend): alt gr treated wrong #7604

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
20 changes: 19 additions & 1 deletion apps/app-frontend/src/components/ui/settings/instances/game-settings-modal/keybind-input.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ const recording = ref(false)
const statusMessage = ref('')
const controlElement = ref<HTMLElement | null>(null)
let suppressNextClick = false
let pendingLeftControl = false

const messages = defineMessages({
listen: {
Expand Down Expand Up @@ -83,6 +84,7 @@ const messages = defineMessages({
})

const isMac = /Mac|iPhone|iPad|iPod/.test(navigator.platform)
const isWindows = /Win/.test(navigator.platform)
const bindingLabel = computed(() => {
if (props.mixed) return formatMessage(messages.mixed)
if (!props.modelValue) return formatMessage(messages.choose)
Expand Down Expand Up @@ -114,13 +116,16 @@ function startRecording() {
recording.value = true
statusMessage.value = formatMessage(messages.listeningStatus)
window.addEventListener('keydown', handleKeydown, true)
window.addEventListener('keyup', handleKeyup, true)
window.addEventListener('pointerdown', handlePointerDown, true)
window.addEventListener('blur', cancelRecording)
}

function stopRecording() {
recording.value = false
pendingLeftControl = false
window.removeEventListener('keydown', handleKeydown, true)
window.removeEventListener('keyup', handleKeyup, true)
window.removeEventListener('pointerdown', handlePointerDown, true)
window.removeEventListener('blur', cancelRecording)
deactivateKeybindRecording(cancelRecording)
Expand Down Expand Up @@ -168,7 +173,20 @@ function handleKeydown(event: KeyboardEvent) {
statusMessage.value = formatMessage(messages.unsupportedStatus)
return
}
assign(token)
if (isWindows && event.code === 'ControlLeft') {
pendingLeftControl = true
return
}

assign(pendingLeftControl && event.code !== 'AltRight' ? 'key.keyboard.left.control' : token)
}

function handleKeyup(event: KeyboardEvent) {
if (!recording.value || !pendingLeftControl || event.code !== 'ControlLeft') return

event.preventDefault()
event.stopPropagation()
assign('key.keyboard.left.control')
}

function handlePointerDown(event: PointerEvent) {
Expand Down
Loading