From bd26bf2a20fba80c33ad1e8438592bddc4bea4aa Mon Sep 17 00:00:00 2001 From: Frank Reininghaus Date: Wed, 28 Mar 2012 19:15:20 +0200 Subject: [PATCH] Increase the timeout in KItemListKeyboardSearchManager to 5 seconds The previous timeout [QApplication::keyboardInputInterval()] was too short to do a multi-letter search for users who do not type extremely fast. (cherry picked from commit 02eab49b2de51c31fe46a0d9501327b579b3648e) --- src/kitemviews/kitemlistkeyboardsearchmanager.cpp | 4 ++-- src/tests/kitemlistkeyboardsearchmanagertest.cpp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/kitemviews/kitemlistkeyboardsearchmanager.cpp b/src/kitemviews/kitemlistkeyboardsearchmanager.cpp index cefedfc2c8..1ff60d09c8 100644 --- a/src/kitemviews/kitemlistkeyboardsearchmanager.cpp +++ b/src/kitemviews/kitemlistkeyboardsearchmanager.cpp @@ -41,8 +41,8 @@ void KItemListKeyboardSearchManager::addKeys(const QString& keys) { const bool keyboardTimeWasValid = m_keyboardInputTime.isValid(); const qint64 keyboardInputTimeElapsed = m_keyboardInputTime.restart(); - if (keyboardInputTimeElapsed > QApplication::keyboardInputInterval() - || !keyboardTimeWasValid || keys.isEmpty()) { + const qint64 timeout = 5000; + if (keyboardInputTimeElapsed > timeout || !keyboardTimeWasValid || keys.isEmpty()) { m_searchedString.clear(); } diff --git a/src/tests/kitemlistkeyboardsearchmanagertest.cpp b/src/tests/kitemlistkeyboardsearchmanagertest.cpp index be483930d9..14a09a31cc 100644 --- a/src/tests/kitemlistkeyboardsearchmanagertest.cpp +++ b/src/tests/kitemlistkeyboardsearchmanagertest.cpp @@ -75,9 +75,9 @@ void KItemListKeyboardSearchManagerTest::testAbortedKeyboardSearch() QCOMPARE(spy.count(), 1); QCOMPARE(spy.takeFirst(), QList() << "fi" << false); - // If the delay between two key presses is larger than QApplication::keyboardInputInterval(), + // If the delay between two key presses is larger than 5000 milliseconds, // a new search is started. We add a small safety margin to avoid race conditions. - QTest::qWait(QApplication::keyboardInputInterval() + 10); + QTest::qWait(5000 + 10); m_keyboardSearchManager.addKeys("l"); QCOMPARE(spy.count(), 1);