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

[ClosedTabs] Fixed saving closed tabs after 1fd1691ee2

Browse Source
This commit is contained in:
nowrep 2014-02-10 19:27:58 +01:00
parent 51498fdb6e
commit 818afc1398
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/lib/webview/tabwidget.cpp
View File

@ -468,10 +468,15 @@ void TabWidget::closeTab(int index, bool force)
}
}
// Save last tab url and history
m_closedTabsManager->saveView(webTab, index);
// window.onbeforeunload handling
if (!webView->page()->mainFrame()->evaluateJavaScript("window.onbeforeunload===null").toBool()) {
webView->load(QUrl());
if (webView->url() != QUrl()) {
// We are not closing, let's remove the tab from history
m_closedTabsManager->takeLastClosedTab();
return;
}
}
@ -481,9 +486,6 @@ void TabWidget::closeTab(int index, bool force)
disconnect(webView, SIGNAL(changed()), mApp, SLOT(setStateChanged()));
disconnect(webView, SIGNAL(ipChanged(QString)), p_QupZilla->ipLabel(), SLOT(setText(QString)));
// Save last tab url and history
m_closedTabsManager->saveView(webTab, index);
if (m_isClosingToLastTabIndex && m_lastTabIndex < count() && index == currentIndex()) {
setCurrentIndex(m_lastTabIndex);
}
@ -749,10 +751,10 @@ void TabWidget::restoreClosedTab(QObject* obj)
QAction* action = qobject_cast<QAction*>(obj);
if (action && action->data().toInt() != 0) {
tab = m_closedTabsManager->getTabAt(action->data().toInt());
tab = m_closedTabsManager->takeTabAt(action->data().toInt());
}
else {
tab = m_closedTabsManager->getFirstClosedTab();
tab = m_closedTabsManager->takeLastClosedTab();
}
if (tab.position < 0) {
@ -770,7 +772,7 @@ void TabWidget::restoreAllClosedTabs()
return;
}
const QVector<ClosedTabsManager::Tab> &closedTabs = m_closedTabsManager->allClosedTabs();
const QLinkedList<ClosedTabsManager::Tab> &closedTabs = m_closedTabsManager->allClosedTabs();
foreach (const ClosedTabsManager::Tab &tab, closedTabs) {
int index = addView(QUrl(), tab.title, Qz::NT_CleanSelectedTab);