summaryrefslogtreecommitdiff
path: root/src/urlbar
diff options
context:
space:
mode:
authorAndrea Diamantini <adjam7@gmail.com>2013-05-05 21:29:24 +0200
committerAndrea Diamantini <adjam7@gmail.com>2013-05-05 21:29:24 +0200
commit8f1bbd6a1086f08814e781ab0a07498f313d0247 (patch)
tree579097d2e0fb267de545b2ef6c0736f06d65c80e /src/urlbar
parentUse a valid object path, otherwise you'll hit an assert (diff)
downloadrekonq-8f1bbd6a1086f08814e781ab0a07498f313d0247.tar.xz
Get sure right icons are deleted before repainting them
This also cleans up a bit UrlBar API
Diffstat (limited to 'src/urlbar')
-rw-r--r--src/urlbar/urlbar.cpp20
1 files changed, 10 insertions, 10 deletions
diff --git a/src/urlbar/urlbar.cpp b/src/urlbar/urlbar.cpp
index a14e39b5..6f4a09fc 100644
--- a/src/urlbar/urlbar.cpp
+++ b/src/urlbar/urlbar.cpp
@@ -391,7 +391,17 @@ void UrlBar::loadStarted()
void UrlBar::loadFinished()
{
refreshFavicon();
+ updateRightIcons();
+}
+
+
+void UrlBar::updateRightIcons()
+{
+ if (_tab->isPageLoading())
+ return;
+ clearRightIcons();
+
if (_tab->url().scheme() == QL1S("about"))
{
update();
@@ -432,16 +442,6 @@ void UrlBar::loadFinished()
}
-void UrlBar::updateRightIcons()
-{
- if (!_tab->isPageLoading())
- {
- clearRightIcons();
- loadFinished();
- }
-}
-
-
void UrlBar::mouseDoubleClickEvent(QMouseEvent *event)
{
Q_UNUSED(event);