AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Windows: Ignore key Shift+F10 unless a shortcut is registered for it.

Browse Source 
This key combination should open the context menu.

Task-number: QTBUG-40085
Change-Id: I7cfc89f766b3734b9fb9d3c9135b4896ffbadb5b
Reviewed-by: Oliver Wolff <oliver.wolff@digia.com>
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@theqtcompany.com>
This commit is contained in:
Friedemann Kleint 2014-11-03 11:44:42 +01:00
parent eab4bd5cee
commit cca4eb45c5
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/plugins/platforms/windows/qwindowskeymapper.cpp
View File

@ -39,6 +39,7 @@
#include <QtGui/QWindow> #include <QtGui/QWindow>
#include <qpa/qwindowsysteminterface.h> #include <qpa/qwindowsysteminterface.h>
#include <private/qguiapplication_p.h>
#include <QtGui/QKeyEvent> #include <QtGui/QKeyEvent>
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
@ -1104,9 +1105,17 @@ bool QWindowsKeyMapper::translateKeyEventInternal(QWindow *window, const MSG &ms
else { else {
const QString text = uch.isNull() ? QString() : QString(uch); const QString text = uch.isNull() ? QString() : QString(uch);
const char a = uch.row() ? 0 : uch.cell(); const char a = uch.row() ? 0 : uch.cell();
const Qt::KeyboardModifiers modifiers(state);
#ifndef QT_NO_SHORTCUT
// Is Qt interested in the context menu key?
if (modifiers == Qt::SHIFT && code == Qt::Key_F10
&& !QGuiApplicationPrivate::instance()->shortcutMap.hasShortcutForKeySequence(QKeySequence(Qt::SHIFT + Qt::Key_F10))) {
return false;
}
#endif // !QT_NO_SHORTCUT
key_recorder.storeKey(msg.wParam, a, state, text); key_recorder.storeKey(msg.wParam, a, state, text);
QWindowSystemInterface::handleExtendedKeyEvent(receiver, QEvent::KeyPress, code, QWindowSystemInterface::handleExtendedKeyEvent(receiver, QEvent::KeyPress, code,
Qt::KeyboardModifier(state), scancode, msg.wParam, nModifiers, text, false); modifiers, scancode, msg.wParam, nModifiers, text, false);
result =true; result =true;
bool store = true; bool store = true;
#ifndef Q_OS_WINCE #ifndef Q_OS_WINCE