summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormegabigbug <megabigbug@arrakis.(none)>2009-10-26 19:27:56 +0100
committermegabigbug <megabigbug@arrakis.(none)>2009-10-26 19:27:56 +0100
commit359fed124bd07c05de8586274f931ea74f1a2c76 (patch)
tree39b7bc9af80e6633d4b1bf3a0c8e5707776e3b3e
parentkeep trailing slashes (BUG 211913) (diff)
downloadrekonq-359fed124bd07c05de8586274f931ea74f1a2c76.tar.xz
fix arrow icon in the url bar
-rw-r--r--src/application.cpp5
-rw-r--r--src/urlbar.cpp10
2 files changed, 8 insertions, 7 deletions
diff --git a/src/application.cpp b/src/application.cpp
index 84aab713..634e068f 100644
--- a/src/application.cpp
+++ b/src/application.cpp
@@ -266,10 +266,7 @@ KIcon Application::icon(const KUrl &url)
{
if(!Application::instance()->mainWindowList().isEmpty()) // avoid infinite loop at startup
{
- // means it is the urlbar
- if(url.isEmpty() && Application::instance()->mainWindow()->currentTab()->url().scheme() == "rekonq")
- return KIcon("arrow-right");
-
+
if(url == KUrl("rekonq:closedTabs"))
return KIcon("tab-close");
if(url == KUrl("rekonq:history"))
diff --git a/src/urlbar.cpp b/src/urlbar.cpp
index 5850f4e4..b6340fe7 100644
--- a/src/urlbar.cpp
+++ b/src/urlbar.cpp
@@ -161,14 +161,18 @@ void UrlBar::slotUpdateUrl()
kDebug() << "Don't change my typed url...";
return;
}
-
+
+ KIcon icon;
+ if(m_currentUrl.isEmpty()) icon = KIcon("arrow-right");
+ else icon = Application::icon(m_currentUrl);
+
if (count())
{
- changeUrl(0, Application::icon(m_currentUrl), m_currentUrl);
+ changeUrl(0, icon, m_currentUrl);
}
else
{
- insertUrl(0, Application::icon(m_currentUrl), m_currentUrl);
+ insertUrl(0, icon, m_currentUrl);
}
setCurrentIndex(0);