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

ProposalWidgets: Accept escape key event

Browse Source 
Otherwise it is passed on to other widgets (like the Find toolbar)

Task-number: QTCREATORBUG-5748
Change-Id: I3e7fe19327d2b3d15c9c9f84360b936dc4698dfd
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
This commit is contained in:
Orgad Shaneh
2013-08-21 23:21:13 +03:00
committed by Orgad Shaneh
parent fc52103524
commit 8f470b0512
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/texteditor/codeassist/functionhintproposalwidget.cpp
View File

@@ -190,12 +190,16 @@ bool FunctionHintProposalWidget::eventFilter(QObject *obj, QEvent *e)
{ {
switch (e->type()) { switch (e->type()) {
case QEvent::ShortcutOverride: case QEvent::ShortcutOverride:
if (static_cast<QKeyEvent*>(e)->key() == Qt::Key_Escape) if (static_cast<QKeyEvent*>(e)->key() == Qt::Key_Escape) {
d->m_escapePressed = true; d->m_escapePressed = true;
e->accept();
}
break; break;
case QEvent::KeyPress: case QEvent::KeyPress:
if (static_cast<QKeyEvent*>(e)->key() == Qt::Key_Escape) if (static_cast<QKeyEvent*>(e)->key() == Qt::Key_Escape) {
d->m_escapePressed = true; d->m_escapePressed = true;
e->accept();
}
if (d->m_model->size() > 1) { if (d->m_model->size() > 1) {
QKeyEvent *ke = static_cast<QKeyEvent*>(e); QKeyEvent *ke = static_cast<QKeyEvent*>(e);
if (ke->key() == Qt::Key_Up) { if (ke->key() == Qt::Key_Up) {

1
src/plugins/texteditor/codeassist/genericproposalwidget.cpp
View File

@@ -571,6 +571,7 @@ bool GenericProposalWidget::eventFilter(QObject *o, QEvent *e)
switch (ke->key()) { switch (ke->key()) {
case Qt::Key_Escape: case Qt::Key_Escape:
abort(); abort();
e->accept();
return true; return true;
case Qt::Key_N: case Qt::Key_N: