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

Function argument widget was closing too early.

Browse Source 
In case the completion shortcut contained the escape key (Mac xcode-like
shortcut settings).

Reviewed-by: Thorbjørn Lindeijer <thorbjorn.lindeijer@nokia.com>
This commit is contained in:
con
2009-04-08 10:26:56 +02:00
parent cbcf5e4871
commit 2e1ecb5c1b
1 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/plugins/cpptools/cppcodecompletion.cpp
View File

@@ -99,6 +99,7 @@ private:
int m_startpos; int m_startpos;
int m_currentarg; int m_currentarg;
int m_current; int m_current;
bool m_escapePressed;
TextEditor::ITextEditor *m_editor; TextEditor::ITextEditor *m_editor;
@@ -197,7 +198,8 @@ using namespace CppTools::Internal;
FunctionArgumentWidget::FunctionArgumentWidget(): FunctionArgumentWidget::FunctionArgumentWidget():
m_startpos(-1), m_startpos(-1),
m_current(0) m_current(0),
m_escapePressed(false)
{ {
QObject *editorObject = Core::EditorManager::instance()->currentEditor(); QObject *editorObject = Core::EditorManager::instance()->currentEditor();
m_editor = qobject_cast<TextEditor::ITextEditor *>(editorObject); m_editor = qobject_cast<TextEditor::ITextEditor *>(editorObject);
@@ -267,6 +269,7 @@ void FunctionArgumentWidget::showFunctionHint(QList<Function *> functionSymbols,
m_context = context; m_context = context;
m_startpos = startPosition; m_startpos = startPosition;
m_current = 0; m_current = 0;
m_escapePressed = false;
// update the text // update the text
m_currentarg = -1; m_currentarg = -1;
@@ -326,7 +329,15 @@ void FunctionArgumentWidget::updateArgumentHighlight()
bool FunctionArgumentWidget::eventFilter(QObject *obj, QEvent *e) bool FunctionArgumentWidget::eventFilter(QObject *obj, QEvent *e)
{ {
switch (e->type()) { switch (e->type()) {
case QEvent::ShortcutOverride:
if (static_cast<QKeyEvent*>(e)->key() == Qt::Key_Escape) {
m_escapePressed = true;
}
break;
case QEvent::KeyPress: case QEvent::KeyPress:
if (static_cast<QKeyEvent*>(e)->key() == Qt::Key_Escape) {
m_escapePressed = true;
}
if (m_items.size() > 1) { if (m_items.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) {
@@ -340,7 +351,7 @@ bool FunctionArgumentWidget::eventFilter(QObject *obj, QEvent *e)
} }
break; break;
case QEvent::KeyRelease: case QEvent::KeyRelease:
if (static_cast<QKeyEvent*>(e)->key() == Qt::Key_Escape) { if (static_cast<QKeyEvent*>(e)->key() == Qt::Key_Escape && m_escapePressed) {
m_popupFrame->close(); m_popupFrame->close();
return false; return false;
} }