From 17ef334c4c474ecc9dcb59853f6e81a2a475ea8a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20T=C5=AFma?= Date: Sat, 21 Sep 2024 13:14:49 +0200 Subject: [PATCH] Revert "Clean up the splitter/graph tabs logic" This reverts commit b01dcc4569b21107125d6ae912d0634b300add88. --- src/GUI/gui.cpp | 14 +++++++++----- src/GUI/gui.h | 2 +- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/src/GUI/gui.cpp b/src/GUI/gui.cpp index 509ec8ca..d29ed9ce 100644 --- a/src/GUI/gui.cpp +++ b/src/GUI/gui.cpp @@ -1171,7 +1171,8 @@ void GUI::loadData(const Data &data) for (int i = 0; i < _tabs.count(); i++) graphs.append(_tabs.at(i)->loadData(data, _map)); - updateGraphTabs(); + if (updateGraphTabs()) + _splitter->refresh(); paths = _mapView->loadData(data); GraphTab *gt = static_cast(_graphTabWidget->currentWidget()); @@ -1619,7 +1620,7 @@ void GUI::closeAll() void GUI::showGraphs(bool show) { - _graphTabWidget->setVisible(show); + _graphTabWidget->setHidden(!show); } #ifdef Q_OS_ANDROID @@ -2219,10 +2220,11 @@ void GUI::updateNavigationActions() #endif // Q_OS_ANDROID } -void GUI::updateGraphTabs() +bool GUI::updateGraphTabs() { int index; GraphTab *tab; + bool hidden = _graphTabWidget->isHidden(); for (int i = 0; i < _tabs.size(); i++) { tab = _tabs.at(i); @@ -2240,12 +2242,14 @@ void GUI::updateGraphTabs() ((_showTracksAction->isChecked() && _trackCount) || (_showRoutesAction->isChecked() && _routeCount))) { if (_showGraphsAction->isChecked()) - _graphTabWidget->show(); + _graphTabWidget->setHidden(false); _showGraphsAction->setEnabled(true); } else { - _graphTabWidget->hide(); + _graphTabWidget->setHidden(true); _showGraphsAction->setEnabled(false); } + + return (hidden != _graphTabWidget->isHidden()); } void GUI::updateDataDEMDownloadAction() diff --git a/src/GUI/gui.h b/src/GUI/gui.h index 184f8c6c..3b3dd7cc 100644 --- a/src/GUI/gui.h +++ b/src/GUI/gui.h @@ -165,7 +165,7 @@ private: QMenu *menu, const QList &existingActions, int &showError); void updateStatusBarInfo(); void updateWindowTitle(); - void updateGraphTabs(); + bool updateGraphTabs(); void updateDataDEMDownloadAction(); void updateMapDEMDownloadAction(); #ifndef Q_OS_ANDROID