From 014baf8e909af06cce71b718b00c20291ccf0577 Mon Sep 17 00:00:00 2001
From: Nayan <nayan8teen@gmail.com>
Date: Wed, 8 Oct 2025 12:05:06 -0400
Subject: [PATCH] UI: Make Always Offroad more accessible (#1327)

* UI: Make Always Offroad more accessible

* conditional - based on offroad

* no need to delete

* account for always offroad

---------

Co-authored-by: Jason Wen <haibin.wen3@gmail.com>
---
 .../qt/offroad/settings/device_panel.cc         | 17 ++++++++++++-----
 .../qt/offroad/settings/device_panel.h          |  2 ++
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/selfdrive/ui/sunnypilot/qt/offroad/settings/device_panel.cc b/selfdrive/ui/sunnypilot/qt/offroad/settings/device_panel.cc
index 7e3d18bd81..d61630112b 100644
--- a/selfdrive/ui/sunnypilot/qt/offroad/settings/device_panel.cc
+++ b/selfdrive/ui/sunnypilot/qt/offroad/settings/device_panel.cc
@@ -80,7 +80,7 @@ DevicePanelSP::DevicePanelSP(SettingsWindowSP *parent) : DevicePanel(parent) {
   connect(maxTimeOffroad, &OptionControlSP::updateLabels, maxTimeOffroad, &MaxTimeOffroad::refresh);
   addItem(maxTimeOffroad);
 
-    toggleDeviceBootMode = new ButtonParamControlSP("DeviceBootMode", tr("Wake-Up Behavior"), "", "", {"Default", "Offroad"}, 375, true);
+  toggleDeviceBootMode = new ButtonParamControlSP("DeviceBootMode", tr("Wake-Up Behavior"), "", "", {"Default", "Offroad"}, 375, true);
   addItem(toggleDeviceBootMode);
 
   connect(toggleDeviceBootMode, &ButtonParamControlSP::buttonClicked, this, [=](int index) {
@@ -129,9 +129,8 @@ DevicePanelSP::DevicePanelSP(SettingsWindowSP *parent) : DevicePanel(parent) {
   offroadBtn->setFixedWidth(power_layout->sizeHint().width());
   QObject::connect(offroadBtn, &PushButtonSP::clicked, this, &DevicePanelSP::setOffroadMode);
 
-  QVBoxLayout *power_group_layout = new QVBoxLayout();
+  power_group_layout = new QVBoxLayout();
   power_group_layout->setSpacing(25);
-  power_group_layout->addWidget(offroadBtn, 0, Qt::AlignHCenter);
   power_group_layout->addLayout(power_layout);
 
   addItem(power_group_layout);
@@ -143,7 +142,7 @@ DevicePanelSP::DevicePanelSP(SettingsWindowSP *parent) : DevicePanel(parent) {
     buttons["quietModeBtn"],
   };
 
-  QObject::connect(uiState(), &UIState::offroadTransition, [=](bool offroad) {
+  QObject::connect(uiState(), &UIState::offroadTransition, [=](bool _offroad) {
     for (auto btn : findChildren<PushButtonSP*>()) {
       bool always_enabled = std::find(always_enabled_btns.begin(), always_enabled_btns.end(), btn) != always_enabled_btns.end();
 
@@ -151,6 +150,8 @@ DevicePanelSP::DevicePanelSP(SettingsWindowSP *parent) : DevicePanel(parent) {
         btn->setEnabled(offroad);
       }
     }
+    offroad = _offroad;
+    updateState();
   });
 }
 
@@ -201,7 +202,7 @@ void DevicePanelSP::updateState() {
   }
 
   bool offroad_mode_param = params.getBool("OffroadMode");
-  offroadBtn->setText(offroad_mode_param ? tr("Exit Always Offroad") : tr("Always Offroad"));
+  offroadBtn->setText(offroad_mode_param ? tr("Exit Always Offroad") : tr("Enable Always Offroad"));
   offroadBtn->setStyleSheet(offroad_mode_param ? alwaysOffroadStyle : autoOffroadStyle);
 
   DeviceSleepModeStatus currStatus = DeviceSleepModeStatus::DEFAULT;
@@ -216,4 +217,10 @@ void DevicePanelSP::updateState() {
   } else {
     interactivityTimeout->setLabel(timeoutValue + "s");
   }
+
+  if (offroad and not offroad_mode_param) {
+    power_group_layout->insertWidget(0, offroadBtn, 0, Qt::AlignHCenter);
+  } else {
+    AddWidgetAt(0, offroadBtn);
+  }
 }
diff --git a/selfdrive/ui/sunnypilot/qt/offroad/settings/device_panel.h b/selfdrive/ui/sunnypilot/qt/offroad/settings/device_panel.h
index 899a942dae..1e86e72014 100644
--- a/selfdrive/ui/sunnypilot/qt/offroad/settings/device_panel.h
+++ b/selfdrive/ui/sunnypilot/qt/offroad/settings/device_panel.h
@@ -34,6 +34,8 @@ private:
   ButtonParamControlSP *toggleDeviceBootMode;
   Brightness *brightness;
   OptionControlSP *interactivityTimeout;
+  QVBoxLayout *power_group_layout;
+  bool offroad;
 
   const QString alwaysOffroadStyle = R"(
     PushButtonSP {