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

Fixed "window on top"

Browse Source 
* do not show navigator
* no longer "on top" does not mean "on bottom"
* Qt::QueuedConnection
This commit is contained in:
Klaus Basan
2019-05-24 23:52:37 +02:00
parent 430f88d700
commit b28d8c7439
5 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/blackgui/components/navigatordialog.h
View File

@@ -131,7 +131,7 @@ namespace BlackGui
int m_currentColumns = 1; int m_currentColumns = 1;
QWidgetAction *m_marginMenuAction = nullptr; //!< menu widget(!) action for margin widget QWidgetAction *m_marginMenuAction = nullptr; //!< menu widget(!) action for margin widget
CMarginsInput *m_input = nullptr; //!< margins widget CMarginsInput *m_input = nullptr; //!< margins widget
QTimer m_watchdog; QTimer m_watchdog; //!< navigator watchdog
BlackMisc::CSetting<BlackGui::Settings::TNavigator> m_settings { this, &CNavigatorDialog::onSettingsChanged }; BlackMisc::CSetting<BlackGui::Settings::TNavigator> m_settings { this, &CNavigatorDialog::onSettingsChanged };
}; };
} // ns } // ns

2
src/blackgui/guiapplication.cpp
View File

@@ -1118,7 +1118,7 @@ namespace BlackGui
bool CGuiApplication::toggleStayOnTop() bool CGuiApplication::toggleStayOnTop()
{ {
QWidget *w = CGuiApplication::mainApplicationWidget(); QMainWindow *w = CGuiApplication::mainApplicationWindow();
if (!w) { return false; } if (!w) { return false; }
const bool onTop = CGuiUtility::toggleStayOnTop(w); const bool onTop = CGuiUtility::toggleStayOnTop(w);
CLogMessage(w).info(onTop ? QStringLiteral("Window on top") : QStringLiteral("Window not always on top")); CLogMessage(w).info(onTop ? QStringLiteral("Window on top") : QStringLiteral("Window not always on top"));

2
src/blackgui/guiutility.cpp
View File

@@ -393,7 +393,7 @@ namespace BlackGui
if (Qt::WindowStaysOnTopHint & flags) if (Qt::WindowStaysOnTopHint & flags)
{ {
flags &= ~Qt::WindowStaysOnTopHint; flags &= ~Qt::WindowStaysOnTopHint;
flags |= Qt::WindowStaysOnBottomHint; // flags |= Qt::WindowStaysOnBottomHint;
} }
else else
{ {

5
src/swiftguistandard/swiftguistd.cpp
View File

@@ -380,7 +380,8 @@ void SwiftGuiStd::onToggledWindowsOnTop(bool onTop)
{ {
if (onTop) if (onTop)
{ {
if (m_navigator) { m_navigator->showNavigator(true); } // here we could automatically display the navigator
// if (m_navigator) { m_navigator->showNavigator(true); }
ui->comp_MainInfoArea->allFloatingOnTop(); ui->comp_MainInfoArea->allFloatingOnTop();
} }
} }
@@ -418,7 +419,7 @@ void SwiftGuiStd::showNormal()
void SwiftGuiStd::onNavigatorClosed() void SwiftGuiStd::onNavigatorClosed()
{ {
// this->showNormal(); // void
} }
void SwiftGuiStd::verifyPrerequisites() void SwiftGuiStd::verifyPrerequisites()

4
src/swiftguistandard/swiftguistdinit.cpp
View File

@@ -223,7 +223,7 @@ void SwiftGuiStd::initGuiSignals()
connect(ui->menu_WindowToggleNavigator, &QAction::triggered, m_navigator.data(), &CNavigatorDialog::toggleNavigatorVisibility); connect(ui->menu_WindowToggleNavigator, &QAction::triggered, m_navigator.data(), &CNavigatorDialog::toggleNavigatorVisibility);
connect(ui->menu_InternalsPage, &QAction::triggered, this, &SwiftGuiStd::onMenuClicked); connect(ui->menu_InternalsPage, &QAction::triggered, this, &SwiftGuiStd::onMenuClicked);
connect(ui->menu_MovingMap, &QAction::triggered, this, &SwiftGuiStd::onMenuClicked); connect(ui->menu_MovingMap, &QAction::triggered, this, &SwiftGuiStd::onMenuClicked);
connect(m_navigator.data(), &CNavigatorDialog::navigatorClosed, this, &SwiftGuiStd::onNavigatorClosed); connect(m_navigator.data(), &CNavigatorDialog::navigatorClosed, this, &SwiftGuiStd::onNavigatorClosed, Qt::QueuedConnection);
// settings (GUI component), styles // settings (GUI component), styles
connect(ui->comp_MainInfoArea->getSettingsComponent(), &CSettingsComponent::changedWindowsOpacity, this, &SwiftGuiStd::onChangedWindowOpacity); connect(ui->comp_MainInfoArea->getSettingsComponent(), &CSettingsComponent::changedWindowsOpacity, this, &SwiftGuiStd::onChangedWindowOpacity);
@@ -270,7 +270,7 @@ void SwiftGuiStd::initGuiSignals()
}); });
// on top // on top
connect(sGui, &CGuiApplication::alwaysOnTop, this, &SwiftGuiStd::onToggledWindowsOnTop); connect(sGui, &CGuiApplication::alwaysOnTop, this, &SwiftGuiStd::onToggledWindowsOnTop, Qt::QueuedConnection);
// main info area // main info area
connect(ui->comp_MainInfoArea, &CMainInfoAreaComponent::changedWholeInfoAreaFloating, this, &SwiftGuiStd::onChangedMainInfoAreaFloating, Qt::QueuedConnection); connect(ui->comp_MainInfoArea, &CMainInfoAreaComponent::changedWholeInfoAreaFloating, this, &SwiftGuiStd::onChangedMainInfoAreaFloating, Qt::QueuedConnection);