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

Merge branch 'v2.1'

Browse Source
This commit is contained in:
David Rosca 2017-02-07 11:08:41 +01:00
commit 1f362c0cb7
3 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/lib/preferences/preferences.cpp
View File

@ -847,7 +847,7 @@ void Preferences::saveSettings()
switch (ui->newTab->currentIndex()) {
case 0:
settings.setValue("newTabUrl", QUrl(QSL("about:blank")));
settings.setValue("newTabUrl", QUrl());
break;
case 1:

6
src/lib/tabwidget/tabicon.cpp
View File

@ -90,7 +90,11 @@ void TabIcon::updateIcon()
{
m_sitePixmap = m_tab->icon(/*allowNull*/ true).pixmap(16);
if (m_sitePixmap.isNull()) {
m_hideTimer->start();
if (m_tab->url().isEmpty() || m_tab->url().scheme() == QL1S("qupzilla")) {
hide();
} else {
m_hideTimer->start();
}
} else {
show();
}

3
src/lib/webtab/webtab.cpp
View File

@ -291,8 +291,9 @@ void WebTab::attach(BrowserWindow* window)
m_tabBar = m_window->tabWidget()->tabBar();
m_webView->setBrowserWindow(m_window);
m_tabBar->setTabButton(tabIndex(), m_tabBar->iconButtonPosition(), m_tabIcon);
m_tabBar->setTabText(tabIndex(), title());
m_tabBar->setTabButton(tabIndex(), m_tabBar->iconButtonPosition(), m_tabIcon);
m_tabIcon->updateIcon();
}
void WebTab::setHistoryData(const QByteArray &data)