diff --git a/selfdrive/ui/sunnypilot/qt/offroad/settings/display/onroad_screen_brightness.cc b/selfdrive/ui/sunnypilot/qt/offroad/settings/display/onroad_screen_brightness.cc
index 8833ffa89..f28d9e45e 100644
--- a/selfdrive/ui/sunnypilot/qt/offroad/settings/display/onroad_screen_brightness.cc
+++ b/selfdrive/ui/sunnypilot/qt/offroad/settings/display/onroad_screen_brightness.cc
@@ -12,31 +12,29 @@ OnroadScreenBrightnessControl::OnroadScreenBrightnessControl(const QString ¶
QWidget *parent)
: ExpandableToggleRow(param, title, description, icon, parent) {
auto *mainFrame = new QFrame(this);
- auto *mainFrameLayout = new QGridLayout();
+ auto *mainFrameLayout = new QVBoxLayout();
mainFrame->setLayout(mainFrameLayout);
- mainFrameLayout->setSpacing(0);
+ mainFrameLayout->setSpacing(30);
mainFrameLayout->setContentsMargins(0, 0, 0, 0);
onroadScreenOffTimer = new OptionControlSP(
"OnroadScreenOffTimer",
- "",
+ "Onroad Brightness Delay",
"",
"",
{0, 11}, 1, true, &onroadScreenOffTimerOptions);
onroadScreenBrightness = new OptionControlSP(
"OnroadScreenOffBrightness",
+ "Onroad Brightness",
"",
"",
- "",
- {0, 100}, 10, true, nullptr, false);
+ {0, 100}, 10, true);
connect(onroadScreenOffTimer, &OptionControlSP::updateLabels, this, &OnroadScreenBrightnessControl::refresh);
connect(onroadScreenBrightness, &OptionControlSP::updateLabels, this, &OnroadScreenBrightnessControl::refresh);
- onroadScreenOffTimer->setFixedWidth(280);
- onroadScreenBrightness->setFixedWidth(280);
- mainFrameLayout->addWidget(onroadScreenOffTimer, 0, 0, Qt::AlignLeft);
- mainFrameLayout->addWidget(onroadScreenBrightness, 0, 1, Qt::AlignRight);
+ mainFrameLayout->addWidget(onroadScreenBrightness);
+ mainFrameLayout->addWidget(onroadScreenOffTimer);
addItem(mainFrame);
@@ -46,19 +44,11 @@ OnroadScreenBrightnessControl::OnroadScreenBrightnessControl(const QString ¶
void OnroadScreenBrightnessControl::refresh() {
// Driving Screen Off Timer
int valTimer = std::atoi(params.get("OnroadScreenOffTimer").c_str());
- std::string labelTimer = "";
- labelTimer += "Delay";
- labelTimer += "
";
- labelTimer += (valTimer < 60 ? std::to_string(valTimer) + "s" : std::to_string(valTimer / 60) + "m");
- labelTimer += "";
+ std::string labelTimer = (valTimer < 60 ? std::to_string(valTimer) + "s" : std::to_string(valTimer / 60) + "m");
onroadScreenOffTimer->setLabel(QString::fromStdString(labelTimer));
// Driving Screen Off Brightness
std::string valBrightness = params.get("OnroadScreenOffBrightness");
- std::string labelBrightness = "";
- labelBrightness += "Brightness";
- labelBrightness += "
";
- labelBrightness += (valBrightness == "0" ? " Screen Off" : valBrightness + "%");
- labelBrightness += "";
+ std::string labelBrightness = (valBrightness == "0" ? " Screen Off" : valBrightness + "%");
onroadScreenBrightness->setLabel(QString::fromStdString(labelBrightness));
}
diff --git a/selfdrive/ui/sunnypilot/qt/offroad/settings/display_panel.cc b/selfdrive/ui/sunnypilot/qt/offroad/settings/display_panel.cc
index 274e28cf8..465047f17 100644
--- a/selfdrive/ui/sunnypilot/qt/offroad/settings/display_panel.cc
+++ b/selfdrive/ui/sunnypilot/qt/offroad/settings/display_panel.cc
@@ -18,9 +18,9 @@ DisplayPanel::DisplayPanel(QWidget *parent) : QWidget(parent) {
// Onroad Screen Off/Brightness
onroadScreenBrightnessControl = new OnroadScreenBrightnessControl(
"OnroadScreenOffControl",
- tr("Driving Screen Off: Non-Critical Events"),
+ tr("Onroad Screen: Reduced Brightness"),
tr("Turn off device screen or reduce brightness after driving starts. "
- "It automatically brightens again when screen is touched or a critical event occurs."),
+ "It automatically brightens again when screen is touched or a visible alert is displayed."),
"",
this);
list->addItem(onroadScreenBrightnessControl);