From c88fe5294de37baaa7af5ea81309e826500d9da2 Mon Sep 17 00:00:00 2001 From: nayan8teen Date: Mon, 2 Jun 2025 21:38:07 -0400 Subject: [PATCH] update margins --- .../sunnypilot/qt/offroad/settings/longitudinal_panel.cc | 2 +- .../qt/offroad/settings/slc/speed_limit_control_policy.cc | 6 ++++-- .../offroad/settings/slc/speed_limit_control_subpanel.cc | 6 ++++-- .../offroad/settings/slc/speed_limit_control_warning.cc | 8 +++++--- 4 files changed, 14 insertions(+), 8 deletions(-) diff --git a/selfdrive/ui/sunnypilot/qt/offroad/settings/longitudinal_panel.cc b/selfdrive/ui/sunnypilot/qt/offroad/settings/longitudinal_panel.cc index b66ea34be1..5a7d860fc9 100644 --- a/selfdrive/ui/sunnypilot/qt/offroad/settings/longitudinal_panel.cc +++ b/selfdrive/ui/sunnypilot/qt/offroad/settings/longitudinal_panel.cc @@ -28,7 +28,7 @@ LongitudinalPanel::LongitudinalPanel(QWidget *parent) : QWidget(parent) { cruisePanelScreen = new QWidget(this); QVBoxLayout* vlayout = new QVBoxLayout(cruisePanelScreen); - vlayout->setContentsMargins(50, 20, 50, 20); + vlayout->setContentsMargins(0, 0, 0, 0); cruisePanelScroller = new ScrollViewSP(list, this); vlayout->addWidget(cruisePanelScroller); diff --git a/selfdrive/ui/sunnypilot/qt/offroad/settings/slc/speed_limit_control_policy.cc b/selfdrive/ui/sunnypilot/qt/offroad/settings/slc/speed_limit_control_policy.cc index 4156486901..3b50c36300 100644 --- a/selfdrive/ui/sunnypilot/qt/offroad/settings/slc/speed_limit_control_policy.cc +++ b/selfdrive/ui/sunnypilot/qt/offroad/settings/slc/speed_limit_control_policy.cc @@ -9,14 +9,16 @@ SpeedLimitControlPolicy::SpeedLimitControlPolicy(QWidget *parent) : QWidget(parent) { QVBoxLayout* main_layout = new QVBoxLayout(this); - main_layout->setContentsMargins(50, 20, 50, 20); - main_layout->setSpacing(20); + main_layout->setContentsMargins(0, 0, 0, 0); + main_layout->setSpacing(0); // Back button PanelBackButton* back = new PanelBackButton(tr("Back")); connect(back, &QPushButton::clicked, [=]() { emit backPress(); }); main_layout->addWidget(back, 0, Qt::AlignLeft); + main_layout->addSpacing(10); + ListWidgetSP *list = new ListWidgetSP(this, true); std::vector slc_policy_texts{ diff --git a/selfdrive/ui/sunnypilot/qt/offroad/settings/slc/speed_limit_control_subpanel.cc b/selfdrive/ui/sunnypilot/qt/offroad/settings/slc/speed_limit_control_subpanel.cc index 6ecf0f0cce..080ce61d57 100644 --- a/selfdrive/ui/sunnypilot/qt/offroad/settings/slc/speed_limit_control_subpanel.cc +++ b/selfdrive/ui/sunnypilot/qt/offroad/settings/slc/speed_limit_control_subpanel.cc @@ -10,14 +10,16 @@ SpeedLimitControlSubpanel::SpeedLimitControlSubpanel(QWidget *parent) : QStackedWidget(parent) { subPanelFrame = new QFrame(); QVBoxLayout *subPanelLayout = new QVBoxLayout(subPanelFrame); - subPanelLayout->setContentsMargins(50, 20, 50, 20); - subPanelLayout->setSpacing(20); + subPanelLayout->setContentsMargins(0, 0, 0, 0); + subPanelLayout->setSpacing(0); // Back button PanelBackButton* back = new PanelBackButton(tr("Back")); connect(back, &QPushButton::clicked, [=]() { emit backPress(); }); subPanelLayout->addWidget(back, 0, Qt::AlignLeft); + subPanelLayout->addSpacing(20); + ListWidgetSP *list = new ListWidgetSP(this, true); auto *slcBtnFrame = new QFrame(this); diff --git a/selfdrive/ui/sunnypilot/qt/offroad/settings/slc/speed_limit_control_warning.cc b/selfdrive/ui/sunnypilot/qt/offroad/settings/slc/speed_limit_control_warning.cc index 5b0722f08c..3513a1115d 100644 --- a/selfdrive/ui/sunnypilot/qt/offroad/settings/slc/speed_limit_control_warning.cc +++ b/selfdrive/ui/sunnypilot/qt/offroad/settings/slc/speed_limit_control_warning.cc @@ -9,14 +9,16 @@ SpeedLimitControlWarning::SpeedLimitControlWarning(QWidget *parent) : QWidget(parent) { QVBoxLayout* main_layout = new QVBoxLayout(this); - main_layout->setContentsMargins(50, 20, 50, 20); - main_layout->setSpacing(20); + main_layout->setContentsMargins(0, 0, 0, 0); + main_layout->setSpacing(0); // Back button PanelBackButton* back = new PanelBackButton(tr("Back")); connect(back, &QPushButton::clicked, [=]() { emit backPress(); }); main_layout->addWidget(back, 0, Qt::AlignLeft); + main_layout->addSpacing(10); + ListWidgetSP *list = new ListWidgetSP(this, true); std::vector slc_warning_texts{ @@ -41,7 +43,7 @@ SpeedLimitControlWarning::SpeedLimitControlWarning(QWidget *parent) : QWidget(pa slc_warning_offset_settings = new ButtonParamControlSP( "SpeedLimitWarningOffsetType", tr("Warning Offset"), - tr(""), + "", "", slc_warning_offset_texts, 300);