Skip to content

Commit

Permalink
Fix missing key events for some keypad keys
Browse files Browse the repository at this point in the history
Fixes #1325
  • Loading branch information
andydotxyz committed Oct 14, 2020
1 parent 9f1ea2e commit dfe8276
Show file tree
Hide file tree
Showing 2 changed files with 26 additions and 10 deletions.
32 changes: 22 additions & 10 deletions internal/driver/glfw/window.go
Expand Up @@ -839,16 +839,26 @@ var keyCodeMap = map[glfw.Key]fyne.KeyName{
glfw.KeyF12: fyne.KeyF12,

// numbers - lookup by code to avoid AZERTY using the symbol name instead of number
glfw.Key0: fyne.Key0,
glfw.Key1: fyne.Key1,
glfw.Key2: fyne.Key2,
glfw.Key3: fyne.Key3,
glfw.Key4: fyne.Key4,
glfw.Key5: fyne.Key5,
glfw.Key6: fyne.Key6,
glfw.Key7: fyne.Key7,
glfw.Key8: fyne.Key8,
glfw.Key9: fyne.Key9,
glfw.Key0: fyne.Key0,
glfw.KeyKP0: fyne.Key0,
glfw.Key1: fyne.Key1,
glfw.KeyKP1: fyne.Key1,
glfw.Key2: fyne.Key2,
glfw.KeyKP2: fyne.Key2,
glfw.Key3: fyne.Key3,
glfw.KeyKP3: fyne.Key3,
glfw.Key4: fyne.Key4,
glfw.KeyKP4: fyne.Key4,
glfw.Key5: fyne.Key5,
glfw.KeyKP5: fyne.Key5,
glfw.Key6: fyne.Key6,
glfw.KeyKP6: fyne.Key6,
glfw.Key7: fyne.Key7,
glfw.KeyKP7: fyne.Key7,
glfw.Key8: fyne.Key8,
glfw.KeyKP8: fyne.Key8,
glfw.Key9: fyne.Key9,
glfw.KeyKP9: fyne.Key9,

// desktop
glfw.KeyLeftShift: desktop.KeyShiftLeft,
Expand All @@ -869,9 +879,11 @@ var keyNameMap = map[string]fyne.KeyName{
"-": fyne.KeyMinus,
".": fyne.KeyPeriod,
"/": fyne.KeySlash,
"*": fyne.KeyAsterisk,
"`": fyne.KeyBackTick,

";": fyne.KeySemicolon,
"+": fyne.KeyPlus,
"=": fyne.KeyEqual,

"a": fyne.KeyA,
Expand Down
4 changes: 4 additions & 0 deletions key.go
Expand Up @@ -161,6 +161,10 @@ const (
KeySemicolon KeyName = ";"
// KeyEqual is the key "="
KeyEqual KeyName = "="
// KeyAsterisk is the keypad key "*"
KeyAsterisk KeyName = "*"
// KeyPlus is the keypad key "+"
KeyPlus KeyName = "+"
// KeyBackTick is the key "`" on a US keyboard
KeyBackTick KeyName = "`"
)

0 comments on commit dfe8276

Please sign in to comment.