summaryrefslogtreecommitdiff
path: root/src/urlbar
diff options
context:
space:
mode:
authorAndrea Diamantini <adjam7@gmail.com>2010-09-04 01:15:36 +0200
committerAndrea Diamantini <adjam7@gmail.com>2010-09-04 01:15:36 +0200
commit81639de005e218b14876530e0e309b6bb160fd50 (patch)
treefa19e17f82164c2a6a95017d23035855b0d87ca0 /src/urlbar
parentRecognize .local & .eu domains. (diff)
downloadrekonq-81639de005e218b14876530e0e309b6bb160fd50.tar.xz
Restore autocomplete shortcuts. Or at least, I hope so :)
BUG: 243902
Diffstat (limited to 'src/urlbar')
-rw-r--r--src/urlbar/completionwidget.cpp5
-rw-r--r--src/urlbar/urlbar.cpp4
2 files changed, 8 insertions, 1 deletions
diff --git a/src/urlbar/completionwidget.cpp b/src/urlbar/completionwidget.cpp
index a2bf5dbc..be189001 100644
--- a/src/urlbar/completionwidget.cpp
+++ b/src/urlbar/completionwidget.cpp
@@ -273,6 +273,11 @@ bool CompletionWidget::eventFilter(QObject *obj, QEvent *ev)
case Qt::Key_Enter:
case Qt::Key_Return:
+
+ // let urlbar handle Return + Modifiers
+ if(!(kev->modifiers() & Qt::NoModifier))
+ return false;
+
w = qobject_cast<UrlBar *>(parent());
if( _currentIndex == -1)
_currentIndex = 0;
diff --git a/src/urlbar/urlbar.cpp b/src/urlbar/urlbar.cpp
index 25c7b748..7206b5e1 100644
--- a/src/urlbar/urlbar.cpp
+++ b/src/urlbar/urlbar.cpp
@@ -263,8 +263,10 @@ void UrlBar::keyPressEvent(QKeyEvent *event)
{
host += append;
url.setHost(host);
- setText(url.toString());
}
+
+ // now, load it!
+ activated(url);
}
if (event->key() == Qt::Key_Escape)