1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

QKeySequenceEdit: Allow for the case where pressing SHIFT+letter gives a different letter

Browse Source 
On some keyboard layouts it is possible that pressing SHIFT+letter does
not give the upper case version of the character. So we depend on QKeyMapper
here to give us the right keysequence as then it will compare against
a shortcut created with this combination then.

Task-number: QTBUG-57928
Task-number: QTBUG-57931
Change-Id: I9421f3ab4d3f8d1ee42f9680200d4b017d551057
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
This commit is contained in:
Andy Shaw 2017-01-12 14:10:53 +01:00
parent 9febc58d07
commit 02cc57f4ed
1 changed files with 23 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/widgets/widgets/qkeysequenceedit.cpp
View File

@ -43,6 +43,7 @@
#include "qboxlayout.h" #include "qboxlayout.h"
#include "qlineedit.h" #include "qlineedit.h"
#include <private/qkeymapper_p.h>
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
@ -80,15 +81,8 @@ void QKeySequenceEditPrivate::init()
int QKeySequenceEditPrivate::translateModifiers(Qt::KeyboardModifiers state, const QString &text) int QKeySequenceEditPrivate::translateModifiers(Qt::KeyboardModifiers state, const QString &text)
{ {
Q_UNUSED(text);
int result = 0; int result = 0;
// The shift modifier only counts when it is not used to type a symbol
// that is only reachable using the shift key anyway
if ((state & Qt::ShiftModifier) && (text.isEmpty() ||
!text.at(0).isPrint() ||
text.at(0).isLetterOrNumber() ||
text.at(0).isSpace()))
result |= Qt::SHIFT;
if (state & Qt::ControlModifier) if (state & Qt::ControlModifier)
result |= Qt::CTRL; result |= Qt::CTRL;
if (state & Qt::MetaModifier) if (state & Qt::MetaModifier)
@ -272,7 +266,27 @@ void QKeySequenceEdit::keyPressEvent(QKeyEvent *e)
if (d->keyNum >= QKeySequencePrivate::MaxKeyCount) if (d->keyNum >= QKeySequencePrivate::MaxKeyCount)
return; return;
nextKey |= d->translateModifiers(e->modifiers(), e->text()); if (e->modifiers() & Qt::ShiftModifier) {
QList<int> possibleKeys = QKeyMapper::possibleKeys(e);
int pkTotal = possibleKeys.count();
if (!pkTotal)
return;
bool found = false;
for (int i = 0; i < possibleKeys.size(); ++i) {
if (possibleKeys.at(i) - nextKey == int(e->modifiers())
|| (possibleKeys.at(i) == nextKey && e->modifiers() == Qt::ShiftModifier)) {
nextKey = possibleKeys.at(i);
found = true;
break;
}
}
// Use as fallback
if (!found)
nextKey = possibleKeys.first();
} else {
nextKey |= d->translateModifiers(e->modifiers(), e->text());
}
d->key[d->keyNum] = nextKey; d->key[d->keyNum] = nextKey;
d->keyNum++; d->keyNum++;