Merge commit 'refs/merge-requests/2259' of git://gitorious.org/rekonq/mainline into m2259

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);
 }