flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-16 10:25:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix ASSERT if there are NO tab names (which can be configured)

Browse Source 
* report https://discordapp.com/channels/539048679160676382/539486489977946112/692165190103466005
* use fallback search
* add tooltips
This commit is contained in:
Klaus Basan
2020-03-25 03:26:06 +01:00
committed by Mat Sutcliffe
parent 7d4e897b88
commit 605ccdbaa8
1 changed files with 29 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/blackgui/infoarea.cpp
View File

@@ -749,13 +749,17 @@ namespace BlackGui
int CInfoArea::getTabBarIndexByTitle(const QString &title) const int CInfoArea::getTabBarIndexByTitle(const QString &title) const
{ {
Q_ASSERT_X(!title.isEmpty(), Q_FUNC_INFO, "No title"); BLACK_VERIFY_X(!title.isEmpty(), Q_FUNC_INFO, "No title");
if (title.isEmpty()) { return -1; }
if (m_tabBar->count() < 1) { return -1;} if (m_tabBar->count() < 1) { return -1;}
for (int i = 0; i < m_tabBar->count(); i++) for (int i = 0; i < m_tabBar->count(); i++)
{ {
if (CGuiUtility::lenientTitleComparison(m_tabBar->tabText(i), title)) { return i; } QString tt = m_tabBar->tabText(i);
if (tt.isEmpty()) { tt = m_tabBar->tabToolTip(i); }
if (tt.isEmpty()) { continue; } // cannot find by empty text
if (CGuiUtility::lenientTitleComparison(tt, title)) { return i; }
} }
Q_ASSERT_X(!title.isEmpty(), Q_FUNC_INFO, "Wrong title");
return -1; return -1;
} }
@@ -763,7 +767,27 @@ namespace BlackGui
{ {
if (!dockWidgetInfoArea) { return -1; } if (!dockWidgetInfoArea) { return -1; }
if (dockWidgetInfoArea->isFloating()) { return -1; } if (dockWidgetInfoArea->isFloating()) { return -1; }
return getTabBarIndexByTitle(dockWidgetInfoArea->windowTitleOrBackup()); int index = this->getTabBarIndexByTitle(dockWidgetInfoArea->windowTitleOrBackup());
if (index < 0)
{
// fallback if the tab has no name and cannot be found
int i = 0;
for (const CDockWidgetInfoArea *a : m_dockWidgetInfoAreas)
{
if (a == dockWidgetInfoArea)
{
index = i;
break;
}
++i;
}
}
// sanity check
if (index >= m_tabBar->count()) { index = -1; }
// bye
return index;
} }
void CInfoArea::selectArea(const CDockWidgetInfoArea *dockWidgetInfoArea) void CInfoArea::selectArea(const CDockWidgetInfoArea *dockWidgetInfoArea)
@@ -792,6 +816,7 @@ namespace BlackGui
const QString t(m_tabBar->tabText(i)); const QString t(m_tabBar->tabText(i));
const int areaIndex = t.isEmpty() ? i : this->getAreaIndexByWindowTitle(t); const int areaIndex = t.isEmpty() ? i : this->getAreaIndexByWindowTitle(t);
m_tabBar->setTabIcon(i, indexToPixmap(areaIndex)); m_tabBar->setTabIcon(i, indexToPixmap(areaIndex));
m_tabBar->setTabToolTip(i, t);
} }
} }