flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-03-30 20:15:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

Ref T592, minor GUI utility renaming and adjustments

Browse Source
This commit is contained in:
Klaus Basan
2019-04-05 02:38:04 +02:00
committed by Mat Sutcliffe
parent dc6e18b5a2
commit 423a7dc6f8
3 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/blackgui/guiutility.cpp
View File

@@ -54,7 +54,8 @@ namespace BlackGui
{
// best choice is to check on frameless window
CEnableForFramelessWindow *mw = dynamic_cast<CEnableForFramelessWindow *>(w);
if (mw && mw->isMainApplicationWindow()) { return mw; }
if (!mw) { continue; }
if (mw->isMainApplicationWindow()) { return mw; }
}
return nullptr;
}
@@ -314,10 +315,11 @@ namespace BlackGui
return rl;
}
QPoint CGuiUtility::mainWidgetPosition()
QPoint CGuiUtility::mainWidgetGlobalPosition()
{
CEnableForFramelessWindow *mw = CGuiUtility::mainFramelessEnabledWindow();
return (mw) ? mw->getWidget()->pos() : QPoint();
if (!mw || !mw->getWidget()) { QPoint(); }
return mw->getWidget()->pos(); // is main window, so not mapToGlobal
}
QString CGuiUtility::replaceTabCountValue(const QString &oldName, int count)

2
src/blackgui/guiutility.h
View File

@@ -73,7 +73,7 @@ namespace BlackGui
static QWidgetList topLevelApplicationWidgetsWithName();
//! Position of main widget
static QPoint mainWidgetPosition();
static QPoint mainWidgetGlobalPosition();
//! Replace count in name such as "stations (4)"
static QString replaceTabCountValue(const QString &oldName, int count);

2
src/blackgui/infoarea.cpp
View File

@@ -519,7 +519,7 @@ namespace BlackGui
m_infoAreaFloating = floating;
if (m_infoAreaFloating)
{
QPoint p = CGuiUtility::mainWidgetPosition();
QPoint p = CGuiUtility::mainWidgetGlobalPosition();
this->setWindowFlags(Qt::Dialog);
this->setWindowFlags(this->windowFlags() & ~Qt::WindowContextHelpButtonHint);
this->move(p.rx() + 20, p.ry() + 20);