diff options
| author | Andrea Diamantini <adjam7@gmail.com> | 2010-08-20 19:30:26 +0200 |
|---|---|---|
| committer | Andrea Diamantini <adjam7@gmail.com> | 2010-08-20 19:30:26 +0200 |
| commit | aa05bd3973a2f39f50c14314840f0fe078f16444 (patch) | |
| tree | dd21ae094321ca9f0b803379ad7e93a6b065ec10 /src/urlbar/completionwidget.cpp | |
| parent | bk toolbar by default for the next rekonq. (diff) | |
| parent | Change from QByteArray to QString in the right way (diff) | |
| download | rekonq-aa05bd3973a2f39f50c14314840f0fe078f16444.tar.xz | |
Merge branch 'opensearch'
Conflicts:
src/CMakeLists.txt
src/urlbar/urlresolver.cpp
Diffstat (limited to 'src/urlbar/completionwidget.cpp')
| -rw-r--r-- | src/urlbar/completionwidget.cpp | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/src/urlbar/completionwidget.cpp b/src/urlbar/completionwidget.cpp index b77e2d7c..a9203bf7 100644 --- a/src/urlbar/completionwidget.cpp +++ b/src/urlbar/completionwidget.cpp @@ -153,13 +153,10 @@ void CompletionWidget::activateCurrentListItem() //update text of the url bar bar->blockSignals(true); //without compute suggestions - if (!widget->inherits("SearchListItem")) - bar->setQUrl( widget->url() ); - else - bar->setQUrl( _typedString ); + bar->setQUrl(widget->text()); bar->blockSignals(false); bar->setFocus(); - bar->setCursorPosition( bar->text().length() ); + bar->setCursorPosition(bar->text().length()); } @@ -240,7 +237,7 @@ bool CompletionWidget::eventFilter(QObject *obj, QEvent *ev) if( _currentIndex == -1) _currentIndex = 0; child = findChild<ListItem *>(QString::number(_currentIndex)); - if(child && _typedString == w->text()) + if(child) { emit chosenUrl(child->url(), Rekonq::CurrentTab); } |