saberbud/zeal
1
0
Fork 0
mirror of https://github.com/zealdocs/zeal.git synced 2026-08-29 08:34:50 +08:00
Code Issues Packages Projects Releases Wiki Activity

ui: Fix tab state being overrided when tab to the left is closed

Browse Source
This commit is contained in:
Oleg Shparber
2017-11-20 22:27:58 +02:00
parent 3b8530535d
commit 465a8b92a8
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libs/ui/mainwindow.cpp
+6 -6
View File
@@ -640,15 +640,15 @@ void MainWindow::setupTabBar()
m_tabBar->setMovable(true);
connect(m_tabBar, &QTabBar::currentChanged, this, [this](int index) {
static const char PreviousTabIndexProperty[] = "previousTabIndex";
static const char PreviousTabState[] = "previousTabState";
if (index == -1)
return;
// Save previous tab state
const QVariant previousTabIndex = m_tabBar->property(PreviousTabIndexProperty);
if (previousTabIndex.isValid() && previousTabIndex.toInt() < m_tabStates.size()) {
TabState *previousTabState = m_tabStates.at(previousTabIndex.toInt());
// Save previous tab state. Using 'void *' to avoid Q_DECLARE_METATYPE.
TabState *previousTabState
= static_cast<TabState *>(m_tabBar->property(PreviousTabState).value<void *>());
if (m_tabStates.contains(previousTabState)) {
previousTabState->selections = ui->treeView->selectionModel()->selectedIndexes();
previousTabState->searchScrollPosition = ui->treeView->verticalScrollBar()->value();
previousTabState->tocScrollPosition = ui->tocListView->verticalScrollBar()->value();
@@ -656,8 +656,8 @@ void MainWindow::setupTabBar()
}
// Load current tab state
m_tabBar->setProperty(PreviousTabIndexProperty, index);
TabState *tabState = m_tabStates.at(index);
m_tabBar->setProperty(PreviousTabState, qVariantFromValue(static_cast<void *>(tabState)));
ui->lineEdit->setText(tabState->searchQuery);
ui->tocListView->setModel(tabState->tocModel);