From d6592436481e448933e8124541a8d5654a3b3d34 Mon Sep 17 00:00:00 2001 From: Cameron Clough Date: Wed, 24 May 2023 15:41:14 -0700 Subject: [PATCH] UI: cleanup OffroadHome layout (#28284) --- selfdrive/ui/qt/home.cc | 44 +++++++++++++++++++++-------------------- 1 file changed, 23 insertions(+), 21 deletions(-) diff --git a/selfdrive/ui/qt/home.cc b/selfdrive/ui/qt/home.cc index 273ee6595c..2b8974f73a 100644 --- a/selfdrive/ui/qt/home.cc +++ b/selfdrive/ui/qt/home.cc @@ -130,27 +130,29 @@ OffroadHome::OffroadHome(QWidget* parent) : QFrame(parent) { main_layout->addSpacing(25); center_layout = new QStackedLayout(); - // Vertical experimental button and drive stats layout - QWidget* statsAndExperimentalModeButtonWidget = new QWidget(this); - QVBoxLayout* statsAndExperimentalModeButton = new QVBoxLayout(statsAndExperimentalModeButtonWidget); - statsAndExperimentalModeButton->setSpacing(30); - statsAndExperimentalModeButton->setMargin(0); - - ExperimentalModeButton *experimental_mode = new ExperimentalModeButton(this); - QObject::connect(experimental_mode, &ExperimentalModeButton::openSettings, this, &OffroadHome::openSettings); - - statsAndExperimentalModeButton->addWidget(experimental_mode, 1); - statsAndExperimentalModeButton->addWidget(new DriveStats, 1); - - // Horizontal experimental + drive stats and setup widget - QWidget* statsAndSetupWidget = new QWidget(this); - QHBoxLayout* statsAndSetup = new QHBoxLayout(statsAndSetupWidget); - statsAndSetup->setMargin(0); - statsAndSetup->setSpacing(30); - statsAndSetup->addWidget(statsAndExperimentalModeButtonWidget, 1); - statsAndSetup->addWidget(new SetupWidget); - - center_layout->addWidget(statsAndSetupWidget); + QWidget *home_widget = new QWidget(this); + { + QHBoxLayout *home_layout = new QHBoxLayout(home_widget); + home_layout->setContentsMargins(0, 0, 0, 0); + home_layout->setSpacing(30); + + // left: ExperimentalModeButton, DriveStats + QWidget* left_widget = new QWidget(this); + QVBoxLayout* left_column = new QVBoxLayout(left_widget); + left_column->setContentsMargins(0, 0, 0, 0); + left_column->setSpacing(30); + + ExperimentalModeButton *experimental_mode = new ExperimentalModeButton(this); + QObject::connect(experimental_mode, &ExperimentalModeButton::openSettings, this, &OffroadHome::openSettings); + left_column->addWidget(experimental_mode, 1); + left_column->addWidget(new DriveStats, 1); + + home_layout->addWidget(left_widget, 1); + + // right: SetupWidget + home_layout->addWidget(new SetupWidget); + } + center_layout->addWidget(home_widget); // add update & alerts widgets update_widget = new UpdateAlert();