summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrea Diamantini <adjam7@gmail.com>2010-04-19 09:53:09 +0200
committerAndrea Diamantini <adjam7@gmail.com>2010-04-19 09:53:09 +0200
commitd0c5b80737ac1f9a605110331ee9a080cee85dba (patch)
tree6087871005edd85e2561cb68e8dda7d05c30b211
parentthe "real" fix for 234579 (diff)
parentFix the url bar focus when the only tab is closed (diff)
downloadrekonq-d0c5b80737ac1f9a605110331ee9a080cee85dba.tar.xz
Merge commit 'refs/merge-requests/2242' of git://gitorious.org/rekonq/mainline into m2242
-rw-r--r--src/mainview.cpp2
-rw-r--r--src/urlbar/urlbar.cpp1
2 files changed, 2 insertions, 1 deletions
diff --git a/src/mainview.cpp b/src/mainview.cpp
index a5eaa748..cb2e3b11 100644
--- a/src/mainview.cpp
+++ b/src/mainview.cpp
@@ -467,7 +467,7 @@ void MainView::closeTab(int index)
case 0: // new tab page
case 1: // blank page
w->load( KUrl("about:home") );
- urlBarWidget()->setFocus();
+ urlBar()->setFocus();
break;
case 2: // homepage
w->load( KUrl(ReKonfig::homePage()) );
diff --git a/src/urlbar/urlbar.cpp b/src/urlbar/urlbar.cpp
index a4c7a0e0..8c6c0749 100644
--- a/src/urlbar/urlbar.cpp
+++ b/src/urlbar/urlbar.cpp
@@ -95,6 +95,7 @@ void UrlBar::setQUrl(const QUrl& url)
}
else
{
+ clearFocus();
LineEdit::setUrl(url);
setCursorPosition(0);
iconButton()->setIcon( Application::icon(url) );