summaryrefslogtreecommitdiff
path: root/src/urlbar
diff options
context:
space:
mode:
authorAndrea Diamantini <adjam7@gmail.com>2010-05-16 11:06:39 +0200
committerAndrea Diamantini <adjam7@gmail.com>2010-05-16 11:06:39 +0200
commit9eb74f3b625a6c8a0c6b594615b3f8b3b4623c63 (patch)
tree311cf4c8904eaff4cd9f785781a5f76d3b4fe810 /src/urlbar
parentMerge commit 'refs/merge-requests/97' of git://gitorious.org/rekonq/mainline ... (diff)
parentdon't use adjusteSize() (diff)
downloadrekonq-9eb74f3b625a6c8a0c6b594615b3f8b3b4623c63.tar.xz
Merge commit 'refs/merge-requests/2259' of git://gitorious.org/rekonq/mainline into m2259
Diffstat (limited to 'src/urlbar')
-rw-r--r--src/urlbar/completionwidget.cpp9
-rw-r--r--src/urlbar/urlbar.cpp2
2 files changed, 9 insertions, 2 deletions
diff --git a/src/urlbar/completionwidget.cpp b/src/urlbar/completionwidget.cpp
index b19b163e..9a5c9432 100644
--- a/src/urlbar/completionwidget.cpp
+++ b/src/urlbar/completionwidget.cpp
@@ -85,7 +85,14 @@ void CompletionWidget::insertSearchList(const UrlSearchList &list, const QString
void CompletionWidget::sizeAndPosition()
{
setFixedWidth(_parent->width());
- adjustSize();
+
+ int h=0;
+ for (int i = 0; i < layout()->count(); i++)
+ {
+ QWidget *widget = layout()->itemAt(i)->widget();
+ h += widget->sizeHint().height();
+ }
+ setFixedSize(_parent->width(),h+5);
// position
QPoint p = _parent->mapToGlobal(QPoint(0, 0));
diff --git a/src/urlbar/urlbar.cpp b/src/urlbar/urlbar.cpp
index d2992c4d..06d281e1 100644
--- a/src/urlbar/urlbar.cpp
+++ b/src/urlbar/urlbar.cpp
@@ -402,7 +402,7 @@ void UrlBar::detectTypedString(const QString &typed)
if(_suggestionTimer->isActive())
_suggestionTimer->stop();
- _suggestionTimer->start(150);
+ _suggestionTimer->start(50);
}