diff --git a/selfdrive/ui/qt/home.cc b/selfdrive/ui/qt/home.cc index 80c0318..d87ceb8 100644 --- a/selfdrive/ui/qt/home.cc +++ b/selfdrive/ui/qt/home.cc @@ -84,7 +84,13 @@ void HomeWindow::showDriverView(bool show) { emit closeSettings(); slayout->setCurrentWidget(driver_view); } else { - slayout->setCurrentWidget(home); + if (started) { + slayout->setCurrentWidget(onroad); + sidebar->setVisible(params.getBool("Sidebar")); + } else { + slayout->setCurrentWidget(home); + sidebar->setVisible(show == false); + } } sidebar->setVisible(show == false); } @@ -94,6 +100,7 @@ void HomeWindow::mousePressEvent(QMouseEvent* e) { if ((onroad->isVisible() || body->isVisible()) && (!sidebar->isVisible() || e->x() > sidebar->width())) { sidebar->setVisible(!sidebar->isVisible() && !onroad->isMapVisible()); uiState()->scene.map_open = onroad->isMapVisible(); + params.putBool("Sidebar", sidebar->isVisible()); } } diff --git a/selfdrive/ui/qt/window.cc b/selfdrive/ui/qt/window.cc index 74fd05e..985021a 100644 --- a/selfdrive/ui/qt/window.cc +++ b/selfdrive/ui/qt/window.cc @@ -74,10 +74,11 @@ void MainWindow::closeSettings() { main_layout->setCurrentWidget(homeWindow); if (uiState()->scene.started) { - homeWindow->showSidebar(false); // Map is always shown when using navigate on openpilot if (uiState()->scene.navigate_on_openpilot) { homeWindow->showMapPanel(true); + } else { + homeWindow->showSidebar(params.getBool("Sidebar")); } } }