From ebcd5f12dd8951e9f29d7f333acec05b8542164a Mon Sep 17 00:00:00 2001 From: 0xd34df00d <0xd34df00d@gmail.com> Date: Fri, 22 Nov 2013 17:22:32 +0400 Subject: [PATCH] Invoke previous event filters if they were set. --- src/widgets/win/qxtglobalshortcut_win.cpp | 7 ++++++- src/widgets/x11/qxtglobalshortcut_x11.cpp | 6 +++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/src/widgets/win/qxtglobalshortcut_win.cpp b/src/widgets/win/qxtglobalshortcut_win.cpp index 1f4b611d..aee79343 100644 --- a/src/widgets/win/qxtglobalshortcut_win.cpp +++ b/src/widgets/win/qxtglobalshortcut_win.cpp @@ -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 } diff --git a/src/widgets/x11/qxtglobalshortcut_x11.cpp b/src/widgets/x11/qxtglobalshortcut_x11.cpp index 3a5cd53d..f74d6e87 100644 --- a/src/widgets/x11/qxtglobalshortcut_x11.cpp +++ b/src/widgets/x11/qxtglobalshortcut_x11.cpp @@ -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)