From 73fe601f3d8cbae40d77f57e17c12d6428979d01 Mon Sep 17 00:00:00 2001 From: FrogAi <91348155+FrogAi@users.noreply.github.com> Date: Tue, 27 Feb 2024 16:34:47 -0700 Subject: [PATCH] Sidebar retains its previous display when going onroad Added function to retain the previous sidebar display when going onroad. --- common/params.cc | 1 + selfdrive/ui/qt/home.cc | 1 + selfdrive/ui/qt/window.cc | 3 ++- 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/common/params.cc b/common/params.cc index 963e16cae..c4df18cce 100644 --- a/common/params.cc +++ b/common/params.cc @@ -347,6 +347,7 @@ std::unordered_map keys = { {"ShowMemoryUsage", PERSISTENT}, {"ShowStorageLeft", PERSISTENT}, {"ShowStorageUsed", PERSISTENT}, + {"Sidebar", PERSISTENT}, {"StandardFollow", PERSISTENT}, {"StandardJerk", PERSISTENT}, {"StockTune", PERSISTENT}, diff --git a/selfdrive/ui/qt/home.cc b/selfdrive/ui/qt/home.cc index b48fc7fae..5ca71f187 100644 --- a/selfdrive/ui/qt/home.cc +++ b/selfdrive/ui/qt/home.cc @@ -92,6 +92,7 @@ void HomeWindow::mousePressEvent(QMouseEvent* e) { // Handle sidebar collapsing if ((onroad->isVisible() || body->isVisible()) && (!sidebar->isVisible() || e->x() > sidebar->width())) { sidebar->setVisible(!sidebar->isVisible() && !onroad->isMapVisible()); + params.putBool("Sidebar", sidebar->isVisible()); } } diff --git a/selfdrive/ui/qt/window.cc b/selfdrive/ui/qt/window.cc index 74fd05ed7..985021a5f 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")); } } }