feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Utils: Fix modifier filter for multi cursor events on mac

Browse Source 
It seems the keypad modifier is almost always set, but the alt modifier
blocks usable shortcuts.

Change-Id: I09e5d3a07bdc7ca2f81c3822097c412db2e212bd
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
This commit is contained in:
David Schulz
2024-07-16 12:42:59 +02:00
parent 77f549272e
commit 5aa48c1518
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/libs/utils/multitextcursor.cpp
View File

@@ -339,7 +339,8 @@ static QTextLine currentTextLine(const QTextCursor &cursor)
bool MultiTextCursor::multiCursorEvent( bool MultiTextCursor::multiCursorEvent(
QKeyEvent *e, QKeySequence::StandardKey matchKey, Qt::KeyboardModifiers filterModifiers) QKeyEvent *e, QKeySequence::StandardKey matchKey, Qt::KeyboardModifiers filterModifiers)
{ {
uint searchkey = (e->modifiers() | e->key()) & ~(filterModifiers | Qt::AltModifier); filterModifiers |= (Utils::HostOsInfo::isMacHost() ? Qt::KeypadModifier : Qt::AltModifier);
uint searchkey = (e->modifiers() | e->key()) & ~filterModifiers;
const QList<QKeySequence> bindings = QKeySequence::keyBindings(matchKey); const QList<QKeySequence> bindings = QKeySequence::keyBindings(matchKey);
return bindings.contains(QKeySequence(searchkey)); return bindings.contains(QKeySequence(searchkey));