Merged in 0xd34df00d/libqxt (pull request #41)
Invoke previous event filters if they were set.
This commit is contained in:
commit
7a4998fe23
|
@ -49,7 +49,12 @@ bool QxtGlobalShortcutPrivate::nativeEventFilter(const QByteArray & eventType,
|
|||
const quint32 modifiers = LOWORD(msg->lParam);
|
||||
activateShortcut(keycode, modifiers);
|
||||
}
|
||||
return false;
|
||||
|
||||
#if QT_VERSION < QT_VERSION_CHECK(5,0,0)
|
||||
return prevEventFilter ? prevEventFilter(message) : false;
|
||||
#else
|
||||
return false;
|
||||
#endif
|
||||
}
|
||||
|
||||
|
||||
|
|
|
@ -189,7 +189,11 @@ bool QxtGlobalShortcutPrivate::nativeEventFilter(const QByteArray & eventType,
|
|||
// Mod1Mask == Alt, Mod4Mask == Meta
|
||||
keystate & (ShiftMask | ControlMask | Mod1Mask | Mod4Mask));
|
||||
}
|
||||
return false;
|
||||
#if QT_VERSION < QT_VERSION_CHECK(5,0,0)
|
||||
return prevEventFilter ? prevEventFilter(message) : false;
|
||||
#else
|
||||
return false;
|
||||
#endif
|
||||
}
|
||||
|
||||
quint32 QxtGlobalShortcutPrivate::nativeModifiers(Qt::KeyboardModifiers modifiers)
|
||||
|
|
Loading…
Reference in New Issue