Falkon/falkonOfficial
Falkon/falkonOfficial
1
Fork 0
mirror of https://invent.kde.org/network/falkon.git synced 2024-12-20 10:46:35 +01:00
Code Releases Activity

[LocationCompleter] Force updates of inline domain completer

Browse Source 
Model for inline domain completion is updated asynchronously, so it is
needed to force the update of completer.

This was last regression of completer after switch to threaded searching
in history/bookmarks.
This commit is contained in:
David Rosca 2014-06-26 15:42:38 +02:00
parent 5558d32d82
commit f55dcdf63c
3 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/lib/navigation/completer/locationcompleter.cpp
View File

@ -87,7 +87,7 @@ void LocationCompleter::refreshJobFinished()
LocationCompleterRefreshJob* job = qobject_cast<LocationCompleterRefreshJob*>(sender());
Q_ASSERT(job);
// Don't show result of older jobs
// Don't show results of older jobs
// Also don't open the popup again when it was already closed
if (job->timestamp() > m_lastRefreshTimestamp && !m_popupClosed) {
s_model->setCompletions(job->completions());

11
src/lib/navigation/locationbar.cpp
View File

@ -50,6 +50,7 @@ LocationBar::LocationBar(BrowserWindow* window)
, m_pasteAndGoAction(0)
, m_clearAction(0)
, m_holdingAlt(false)
, m_backspacePressed(false)
, m_loadProgress(0)
, m_progressVisible(false)
{
@ -161,6 +162,11 @@ void LocationBar::clearCompletion()
void LocationBar::showDomainCompletion(const QString &completion)
{
m_domainCompleterModel->setStringList(QStringList() << completion);
// We need to manually force the completion because model is updated asynchronously
// But don't force the completion when backspace was pressed!
if (!m_backspacePressed)
completer()->complete();
}
LoadRequest LocationBar::createLoadRequest() const
@ -473,6 +479,10 @@ void LocationBar::keyPressEvent(QKeyEvent* event)
m_holdingAlt = true;
break;
case Qt::Key_Backspace:
m_backspacePressed = true;
break;
case Qt::Key_Return:
case Qt::Key_Enter:
switch (event->modifiers()) {
@ -514,6 +524,7 @@ void LocationBar::keyPressEvent(QKeyEvent* event)
default:
m_holdingAlt = false;
m_backspacePressed = false;
}
LineEdit::keyPressEvent(event);

1
src/lib/navigation/locationbar.h
View File

@ -108,6 +108,7 @@ private:
bool m_rssIconVisible;
bool m_holdingAlt;
bool m_backspacePressed;
int m_loadProgress;
bool m_progressVisible;