This commit is contained in:
Your Name
2024-05-17 10:37:48 -05:00
parent 07851585cd
commit 4815ffd989
4 changed files with 8 additions and 3 deletions

View File

@@ -30,7 +30,7 @@ HomeWindow::HomeWindow(QWidget* parent) : QWidget(parent) {
sidebar = new Sidebar(this); sidebar = new Sidebar(this);
main_layout->addWidget(sidebar); main_layout->addWidget(sidebar);
QObject::connect(sidebar, &Sidebar::openSettings, this, &HomeWindow::openSettings); QObject::connect(sidebar, &Sidebar::openSettings, this, &HomeWindow::openSettings);
QObject::connect(sidebar, &Sidebar::openOnroad, this, &HomeWindow::openOnroad); QObject::connect(sidebar, &Sidebar::openOnroad, this, &HomeWindow::showOnroad);
slayout = new QStackedLayout(); slayout = new QStackedLayout();
main_layout->addLayout(slayout); main_layout->addLayout(slayout);
@@ -61,8 +61,10 @@ HomeWindow::HomeWindow(QWidget* parent) : QWidget(parent) {
} }
// Debug function to activate onroad UI // Debug function to activate onroad UI
void HomeWindow::openOnroad() { void HomeWindow::showOnroad() {
sidebar->setVisible(false); sidebar->setVisible(false);
slayout->setCurrentWidget(onroad);
// sidebar->setVisible(params.getBool("Sidebar"));
} }
void HomeWindow::showSidebar(bool show) { void HomeWindow::showSidebar(bool show) {
@@ -125,7 +127,7 @@ void HomeWindow::mousePressEvent(QMouseEvent* e) {
void HomeWindow::mouseDoubleClickEvent(QMouseEvent* e) { void HomeWindow::mouseDoubleClickEvent(QMouseEvent* e) {
HomeWindow::mousePressEvent(e); HomeWindow::mousePressEvent(e);
const SubMaster &sm = *(uiState()->sm); // const SubMaster &sm = *(uiState()->sm);
} }
// OffroadHome: the offroad home page // OffroadHome: the offroad home page

View File

@@ -58,6 +58,7 @@ signals:
public slots: public slots:
void offroadTransition(bool offroad); void offroadTransition(bool offroad);
void showDriverView(bool show, bool started=false); void showDriverView(bool show, bool started=false);
void showOnroad();
void showSidebar(bool show); void showSidebar(bool show);
void showMapPanel(bool show); void showMapPanel(bool show);

View File

@@ -127,7 +127,9 @@ void Sidebar::mouseReleaseEvent(QMouseEvent *event) {
emit openOnroad(); emit openOnroad();
} else if (settings_btn.contains(event->pos())) { } else if (settings_btn.contains(event->pos())) {
emit openSettings(); emit openSettings();
} }
} }