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

Ref T447, navigator dialog improvements

Browse Source 
* slots -> normal functions
* watchdog to bring back navigator in case it gets in background
This commit is contained in:
Klaus Basan
2018-12-11 10:52:23 +01:00
parent 86b8fd03be
commit e9beb2d353
2 changed files with 46 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
src/blackgui/components/navigatordialog.cpp
View File

@@ -58,6 +58,10 @@ namespace BlackGui
m_marginMenuAction = new QWidgetAction(this);
m_marginMenuAction->setDefaultWidget(m_input);
// timer
m_watchdog.setObjectName(this->objectName() + ":m_timer");
connect(&m_watchdog, &QTimer::timeout, this, &CNavigatorDialog::onWatchdog);
this->setContextMenuPolicy(Qt::CustomContextMenu);
connect(m_input, &CMarginsInput::changedMargins, this, &CNavigatorDialog::menuChangeMargins);
connect(this, &CNavigatorDialog::customContextMenuRequested, this, &CNavigatorDialog::showContextMenu);
@@ -116,7 +120,8 @@ namespace BlackGui
void CNavigatorDialog::reject()
{
this->hide();
emit navigatorClosed();
m_watchdog.stop();
emit this->navigatorClosed();
}
void CNavigatorDialog::toggleFrameless()
@@ -124,9 +129,26 @@ namespace BlackGui
this->setFrameless(!this->isFrameless());
}
void CNavigatorDialog::toggleNavigator()
void CNavigatorDialog::showNavigator(bool visible)
{
this->setVisible(!this->isVisible());
this->setVisible(visible);
CGuiUtility::stayOnTop(visible, this);
this->show();
if (visible)
{
m_watchdog.start(4000);
}
else
{
m_watchdog.stop();
}
}
void CNavigatorDialog::toggleNavigatorVisibility()
{
const bool visible = !this->isVisible();
this->showNavigator(visible);
}
void CNavigatorDialog::restoreFromSettings()
@@ -309,6 +331,13 @@ namespace BlackGui
this->adjustSize();
}
void CNavigatorDialog::onWatchdog()
{
// if (!this->isVisible()) { return; }
CGuiUtility::stayOnTop(true, this);
this->show();
}
void CNavigatorDialog::addToContextMenu(QMenu *contextMenu) const
{
QAction *a = contextMenu->addAction(CIcons::resize16(), "1 row", this, &CNavigatorDialog::changeLayout);