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

QmlDesigner: Be more specific with overriding shortcuts

Browse Source 
We have to be less aggressive when ovveriden keys, so that
shortcuts like strg+shift+up/down still work.

Task-number: QTCREATORBUG-18361
Change-Id: I2f4819f627f8820533b603575e853aec7d91171d
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
This commit is contained in:
Thomas Hartmann
2017-06-23 13:30:29 +02:00
parent 2123aebf65
commit 681d60143f
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/plugins/qmldesigner/components/texteditor/texteditorwidget.cpp
View File

@@ -175,14 +175,18 @@ void TextEditorWidget::setBlockCurserSelectionSyncronisation(bool b)
bool TextEditorWidget::eventFilter( QObject *, QEvent *event) bool TextEditorWidget::eventFilter( QObject *, QEvent *event)
{ {
static std::vector<int> overrideKeys = { Qt::Key_Delete, Qt::Key_Backspace, Qt::Key_Left, static std::vector<int> overrideKeys = { Qt::Key_Delete, Qt::Key_Backspace, Qt::Key_Insert,
Qt::Key_Right, Qt::Key_Up, Qt::Key_Down, Qt::Key_Insert,
Qt::Key_Escape }; Qt::Key_Escape };
static std::vector<QKeySequence> overrideSequences = { QKeySequence::SelectAll, QKeySequence::Cut, static std::vector<QKeySequence> overrideSequences = { QKeySequence::SelectAll, QKeySequence::Cut,
QKeySequence::Copy, QKeySequence::Delete, QKeySequence::Copy, QKeySequence::Delete,
QKeySequence::Paste, QKeySequence::Undo, QKeySequence::Paste, QKeySequence::Undo,
QKeySequence::Redo, QKeySequence(Qt::CTRL + Qt::ALT) }; QKeySequence::Redo, QKeySequence(Qt::CTRL + Qt::ALT),
QKeySequence(Qt::Key_Left + Qt::CTRL),
QKeySequence(Qt::Key_Right + Qt::CTRL),
QKeySequence(Qt::Key_Up + Qt::CTRL),
QKeySequence(Qt::Key_Down + Qt::CTRL)
};
if (event->type() == QEvent::ShortcutOverride) { if (event->type() == QEvent::ShortcutOverride) {
QKeyEvent *keyEvent = static_cast<QKeyEvent *>(event); QKeyEvent *keyEvent = static_cast<QKeyEvent *>(event);