Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-07 18:24:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

Viewer: Fix regression causing custom shortcuts with shift key pressed not working. Fixes #1903699 [E-book viewer: some key combinations don't work](https://bugs.launchpad.net/calibre/+bug/1903699)

Browse Source
This commit is contained in:
Kovid Goyal 2020-11-10 18:32:25 +05:30
parent 3e7296ff2b
commit 1e679aab90
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/pyj/read_book/shortcuts.pyj
View File

@ -35,8 +35,11 @@ def desc(sc, group, short, long):
def keyevent_as_shortcut(evt): def keyevent_as_shortcut(evt):
key = evt.key
if capital_letters[key] and evt.shiftKey:
key = key.toLowerCase()
return { return {
'key': evt.key, 'altKey': evt.altKey, 'ctrlKey': evt.ctrlKey, 'key': key, 'altKey': evt.altKey, 'ctrlKey': evt.ctrlKey,
'metaKey': evt.metaKey, 'shiftKey': evt.shiftKey 'metaKey': evt.metaKey, 'shiftKey': evt.shiftKey
} }
@ -52,7 +55,7 @@ def get_key_text(evt):
key = evt.key key = evt.key
if key: if key:
# on Windows pressing ctrl+alt+ascii char gives capital letters. On all # on Windows pressing ctrl+alt+ascii char gives capital letters. On all
# platforms shift+key gives capital letters # we define shortcuts using # platforms shift+key gives capital letters we define shortcuts using
# lowercase letters, so lowercase them here. # lowercase letters, so lowercase them here.
if evt.code and key.toLowerCase() is not key and evt.code.startsWith('Key') and capital_letters[key]: if evt.code and key.toLowerCase() is not key and evt.code.startsWith('Key') and capital_letters[key]:
key = key.toLowerCase() key = key.toLowerCase()