From 791ff94dc3b3a01798ce0bf1243de228b3c19e25 Mon Sep 17 00:00:00 2001
From: Thierry Bastian <thierry.bastian@nokia.com>
Date: Mon, 11 Oct 2010 14:28:05 +0200
Subject: The completer in an itemview would not be activated right away

If you have set the edit triggers to AnyKeyPressed and you press a key
the completer would not kick in because the key event would come before
the lineedit gets focus. The completer is only active when the lineedit
has focus.

Task-number: QTBUG14363
Reviewed-by: ogoffart
---
 src/gui/itemviews/qabstractitemview.cpp    |  6 ++---
 tests/auto/qlistwidget/tst_qlistwidget.cpp | 40 ++++++++++++++++++++++++++++++
 2 files changed, 43 insertions(+), 3 deletions(-)

diff --git a/src/gui/itemviews/qabstractitemview.cpp b/src/gui/itemviews/qabstractitemview.cpp
index 0842ee8..b5ca812 100644
--- a/src/gui/itemviews/qabstractitemview.cpp
+++ b/src/gui/itemviews/qabstractitemview.cpp
@@ -4101,13 +4101,13 @@ bool QAbstractItemViewPrivate::openEditor(const QModelIndex &index, QEvent *even
     if (!w)
         return false;
 
-    if (event)
-        QApplication::sendEvent(w->focusProxy() ? w->focusProxy() : w, event);
-
     q->setState(QAbstractItemView::EditingState);
     w->show();
     w->setFocus();
 
+    if (event)
+        QApplication::sendEvent(w->focusProxy() ? w->focusProxy() : w, event);
+
     return true;
 }
 
diff --git a/tests/auto/qlistwidget/tst_qlistwidget.cpp b/tests/auto/qlistwidget/tst_qlistwidget.cpp
index eb3fb6b..8aa50d3 100644
--- a/tests/auto/qlistwidget/tst_qlistwidget.cpp
+++ b/tests/auto/qlistwidget/tst_qlistwidget.cpp
@@ -133,6 +133,7 @@ private slots:
     void task217070_scrollbarsAdjusted();
     void task258949_keypressHangup();
     void QTBUG8086_currentItemChangedOnClick();
+    void QTBUG14363_completerWithAnyKeyPressedEditTriggers();
 
 
 protected slots:
@@ -1640,5 +1641,44 @@ void tst_QListWidget::QTBUG8086_currentItemChangedOnClick()
 }
 
 
+class ItemDelegate : public QItemDelegate
+{
+public:
+	ItemDelegate(QObject *parent = 0) : QItemDelegate(parent)
+	{}
+	virtual QWidget *createEditor(QWidget *parent, const QStyleOptionViewItem &, const QModelIndex &) const
+	{
+		QLineEdit *lineEdit = new QLineEdit(parent);
+		lineEdit->setFrame(false);
+		QCompleter *completer = new QCompleter(QStringList() << "completer", lineEdit);
+		completer->setCompletionMode(QCompleter::InlineCompletion);
+		lineEdit->setCompleter(completer);
+		return lineEdit;
+	}
+};
+
+void tst_QListWidget::QTBUG14363_completerWithAnyKeyPressedEditTriggers()
+{
+	QListWidget listWidget;
+	listWidget.setEditTriggers(QAbstractItemView::AnyKeyPressed);
+    listWidget.setItemDelegate(new ItemDelegate);
+    QListWidgetItem *item = new QListWidgetItem(QLatin1String("select an item (don't start editing)"), &listWidget);
+    item->setFlags(Qt::ItemIsEnabled|Qt::ItemIsSelectable|Qt::ItemIsEditable);
+    new QListWidgetItem(QLatin1String("try to type the letter 'c'"), &listWidget);
+    new QListWidgetItem(QLatin1String("completer"), &listWidget);
+	listWidget.show();
+    listWidget.setCurrentItem(item);
+    QTest::qWaitForWindowShown(&listWidget);
+
+    QTest::keyClick(listWidget.viewport(), Qt::Key_C);
+
+    QLineEdit *le = qobject_cast<QLineEdit*>(listWidget.itemWidget(item));
+    QVERIFY(le);
+    QCOMPARE(le->text(), QString("completer"));
+    QCOMPARE(le->completer()->currentCompletion(), QString("completer"));
+}
+
+
+
 QTEST_MAIN(tst_QListWidget)
 #include "tst_qlistwidget.moc"
-- 
cgit v0.12