storm/thunderpad
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #3 from hydrargyrum/master

Browse Source 
Re-enable Ctrl-X in the "choose key" dialog to shun a joystick button
This commit is contained in:
Mathias Panzenböck
2014-05-12 22:36:10 +02:00
parent 283ac91d95 18cfef63a4
commit 88ee6c1ed8
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/getkey.cpp
View File

@ -46,8 +46,8 @@ bool GetKey::x11Event( XEvent* e )
wasMouse = false; wasMouse = false;
if (XKeycodeToKeysym(QX11Info::display(),e->xkey.keycode,0) == XK_x) { if (XKeycodeToKeysym(QX11Info::display(),e->xkey.keycode,0) == XK_x) {
if (e->xkey.state & ControlMask) { if (e->xkey.state & ControlMask) {
value = -1; value = 0;
reject(); accept();
} }
else { else {
value = e->xkey.keycode; value = e->xkey.keycode;