mirror of
https://github.com/firestar5683/StarPilot.git
synced 2026-06-30 11:02:19 +08:00
nav: hide settings on map request visible (#28884)
old-commit-hash: 6643616c475a2a9a884352af19233e596eb5e9e3
This commit is contained in:
@@ -58,7 +58,7 @@ MapWindow::MapWindow(const QMapboxGLSettings &settings) : m_settings(settings),
|
||||
}
|
||||
)");
|
||||
QObject::connect(settings_btn, &QPushButton::clicked, [=]() {
|
||||
emit openSettings();
|
||||
emit requestSettings(true);
|
||||
});
|
||||
|
||||
overlay_layout->addWidget(map_instructions);
|
||||
@@ -157,6 +157,7 @@ void MapWindow::updateState(const UIState &s) {
|
||||
emit requestVisible(true); // Show map on destination set/change
|
||||
allow_open = false;
|
||||
}
|
||||
emit requestSettings(false);
|
||||
}
|
||||
|
||||
if (m_map.isNull()) {
|
||||
|
||||
@@ -122,5 +122,5 @@ public slots:
|
||||
|
||||
signals:
|
||||
void requestVisible(bool visible);
|
||||
void openSettings();
|
||||
void requestSettings(bool settings);
|
||||
};
|
||||
|
||||
@@ -19,8 +19,8 @@ MapPanel::MapPanel(const QMapboxGLSettings &mapboxSettings, QWidget *parent) : Q
|
||||
if (visible) { emit mapPanelRequested(); }
|
||||
setVisible(visible);
|
||||
});
|
||||
QObject::connect(map, &MapWindow::openSettings, [=]() {
|
||||
content_stack->setCurrentIndex(1);
|
||||
QObject::connect(map, &MapWindow::requestSettings, [=](bool settings) {
|
||||
content_stack->setCurrentIndex(settings ? 1 : 0);
|
||||
});
|
||||
content_stack->addWidget(map);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user