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

Fixed possible crash when using tab to complete (Qt/Carbon only).

Browse Source 
Task-number: QTCREATORBUG-199
Reviewed-by: thorbjorn
This commit is contained in:
Roberto Raggi
2009-11-20 15:07:10 +01:00
parent e2cfc0958e
commit e292554067
1 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/plugins/texteditor/completionwidget.cpp
View File

@@ -139,7 +139,16 @@ bool CompletionWidget::event(QEvent *e)
bool forwardKeys = true; bool forwardKeys = true;
if (e->type() == QEvent::FocusOut) { if (e->type() == QEvent::FocusOut) {
closeList(); QModelIndex index;
#if defined(Q_OS_DARWIN) && ! defined(QT_MAC_USE_COCOA)
QFocusEvent *fe = static_cast<QFocusEvent *>(e);
if (fe->reason() == Qt::OtherFocusReason) {
// Qt/carbon workaround
// focus out is received before the key press event.
index = currentIndex();
}
#endif
closeList(index);
return true; return true;
} else if (e->type() == QEvent::KeyPress) { } else if (e->type() == QEvent::KeyPress) {
QKeyEvent *ke = static_cast<QKeyEvent *>(e); QKeyEvent *ke = static_cast<QKeyEvent *>(e);
@@ -153,7 +162,8 @@ bool CompletionWidget::event(QEvent *e)
case Qt::Key_Tab: case Qt::Key_Tab:
case Qt::Key_Return: case Qt::Key_Return:
//independently from style, accept current entry if return is pressed //independently from style, accept current entry if return is pressed
closeList(currentIndex()); if (qApp->focusWidget() == this)
closeList(currentIndex());
return true; return true;
case Qt::Key_Up: case Qt::Key_Up:
if (currentIndex().row() == 0) { if (currentIndex().row() == 0) {