flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-05 17:35:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

Avoid crash when accessing the main windget position

Browse Source
This commit is contained in:
Klaus Basan
2019-04-27 14:32:29 +02:00
parent 3171bd5661
commit 242d6137e5
3 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/blackgui/dockwidget.cpp
View File

@@ -659,7 +659,7 @@ namespace BlackGui
QPoint pos = CGuiUtility::mainWidgetGlobalPosition();
if (pos.isNull())
{
pos = sGui->currentScreen()->geometry().center() - this->rect().center();
pos = CGuiApplication::currentScreen()->geometry().center() - this->rect().center();
}
const int x = pos.x() + m_offsetWhenFloating.x();

3
src/blackgui/guiapplication.cpp
View File

@@ -355,7 +355,8 @@ namespace BlackGui
QRect CGuiApplication::currentScreenGeometry()
{
const QScreen *s = currentScreen();
return s->geometry();
if (s) return s->geometry();
return {};
}
void CGuiApplication::modalWindowToFront()

12
src/blackgui/guiutility.cpp
View File

@@ -317,9 +317,13 @@ namespace BlackGui
QPoint CGuiUtility::mainWidgetGlobalPosition()
{
CEnableForFramelessWindow *mw = CGuiUtility::mainFramelessEnabledWindow();
if (!mw || !mw->getWidget()) { QPoint(); }
return mw->getWidget()->pos(); // is main window, so not mapToGlobal
QWidget *mw = CGuiUtility::mainApplicationWidget();
if (mw) { return mw->pos(); }
// fallback, can be mfw it is not found
CEnableForFramelessWindow *mfw = CGuiUtility::mainFramelessEnabledWindow();
if (!mfw || !mfw->getWidget()) { return QPoint(); }
return mfw->getWidget()->pos(); // is main window, so not mapToGlobal
}
QString CGuiUtility::replaceTabCountValue(const QString &oldName, int count)
@@ -353,7 +357,7 @@ namespace BlackGui
delete widget;
}
}
else {delete item;}
else { delete item; }
}
// then finally