From 537e629c6ebfdebd18930088c06896e417cf41e2 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 2ddabb74..969c4895 100644
--- a/common/params.cc
+++ b/common/params.cc
@@ -363,6 +363,7 @@ std::unordered_map<std::string, uint32_t> keys = {
     {"ShowMemoryUsage", PERSISTENT},
     {"ShowStorageLeft", PERSISTENT},
     {"ShowStorageUsed", PERSISTENT},
+    {"Sidebar", PERSISTENT},
     {"StandardFollow", PERSISTENT},
     {"StandardJerk", PERSISTENT},
     {"StandbyMode", PERSISTENT},
diff --git a/selfdrive/ui/qt/home.cc b/selfdrive/ui/qt/home.cc
index 2c5f81d8..902d0af7 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 ecc57802..4e4bd36a 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"));
     }
   }
 }