nav: hide settings on map request visible (#28884)

old-commit-hash: 6643616c475a2a9a884352af19233e596eb5e9e3
This commit is contained in:
Cameron Clough
2023-07-11 22:40:33 +02:00
committed by GitHub
parent ef407c9ad9
commit 9716affb3b
3 changed files with 5 additions and 4 deletions
+2 -1
View File
@@ -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()) {
+1 -1
View File
@@ -122,5 +122,5 @@ public slots:
signals:
void requestVisible(bool visible);
void openSettings();
void requestSettings(bool settings);
};
+2 -2
View File
@@ -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);