diff options
| -rw-r--r-- | src/application.cpp | 5 | ||||
| -rw-r--r-- | src/urlbar.cpp | 10 | ||||
| -rw-r--r-- | src/webview.cpp | 6 |
3 files changed, 9 insertions, 12 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); diff --git a/src/webview.cpp b/src/webview.cpp index ce9d421b..3bef7c1f 100644 --- a/src/webview.cpp +++ b/src/webview.cpp @@ -370,11 +370,7 @@ void WebView::mousePressEvent(QMouseEvent *event) void WebView::mouseMoveEvent(QMouseEvent *event) { m_mousePos = event->pos(); - - if( url().protocol() != "rekonq" ) - { - QWebView::mouseMoveEvent(event); - } + QWebView::mouseMoveEvent(event); } QPoint WebView::mousePos() |