Falkon/falkonOfficial
Falkon/falkonOfficial
1
Fork 0
mirror of https://invent.kde.org/network/falkon.git synced 2024-12-20 10:46:35 +01:00
Code Releases Activity

LocationBar: Don't show favicon in site icon

Browse Source 
Most of the sites are https nowadays, for which favicon is not
displayed, so there is no more a reason to show favicon in site
icon in locationbar.
Favicon is still displayed in tab icon.

Closes #918
This commit is contained in:
David Rosca 2018-01-26 12:12:05 +01:00
parent 948e623f9e
commit b9294e02bb
No known key found for this signature in database
GPG Key ID: EBC3FC294452C6D8
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/lib/navigation/locationbar.cpp
View File

@ -130,7 +130,6 @@ void LocationBar::setWebView(TabbedWebView* view)
connect(m_webView, SIGNAL(loadFinished(bool)), SLOT(loadFinished())); connect(m_webView, SIGNAL(loadFinished(bool)), SLOT(loadFinished()));
connect(m_webView, SIGNAL(urlChanged(QUrl)), this, SLOT(showUrl(QUrl))); connect(m_webView, SIGNAL(urlChanged(QUrl)), this, SLOT(showUrl(QUrl)));
connect(m_webView, SIGNAL(privacyChanged(bool)), this, SLOT(setPrivacyState(bool))); connect(m_webView, SIGNAL(privacyChanged(bool)), this, SLOT(setPrivacyState(bool)));
connect(m_webView, &TabbedWebView::iconChanged, this, &LocationBar::updateSiteIcon);
} }
void LocationBar::setText(const QString &text) void LocationBar::setText(const QString &text)
@ -382,9 +381,10 @@ void LocationBar::updateSiteIcon()
if (m_completer->isVisible()) { if (m_completer->isVisible()) {
m_siteIcon->setIcon(QIcon::fromTheme(QSL("edit-find"), QIcon(QSL(":icons/menu/search-icon.svg")))); m_siteIcon->setIcon(QIcon::fromTheme(QSL("edit-find"), QIcon(QSL(":icons/menu/search-icon.svg"))));
} else { } else {
QIcon icon = m_webView ? m_webView->icon() : IconProvider::emptyWebIcon(); QIcon icon = IconProvider::emptyWebIcon();
if (m_webView && m_webView->url().scheme() == QL1S("https")) if (property("secured").toBool()) {
icon = QIcon::fromTheme(QSL("document-encrypted"), icon); icon = QIcon::fromTheme(QSL("document-encrypted"), icon);
}
m_siteIcon->setIcon(QIcon(icon.pixmap(16))); m_siteIcon->setIcon(QIcon(icon.pixmap(16)));
} }
} }
@ -398,6 +398,8 @@ void LocationBar::setPrivacyState(bool state)
setProperty("secured", QVariant(state)); setProperty("secured", QVariant(state));
style()->unpolish(this); style()->unpolish(this);
style()->polish(this); style()->polish(this);
updateSiteIcon();
} }
void LocationBar::pasteAndGo() void LocationBar::pasteAndGo()
@ -608,8 +610,6 @@ void LocationBar::loadFinished()
m_autofillIcon->setFormData(page->autoFillData()); m_autofillIcon->setFormData(page->autoFillData());
m_autofillIcon->show(); m_autofillIcon->show();
} }
updateSiteIcon();
} }
void LocationBar::loadSettings() void LocationBar::loadSettings()