spacecruft
/
nopenpilot
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

ui: fix onroad transition with active nav (#23757)

car-enums
Willem Melching 2022-02-14 13:55:30 +01:00 committed by GitHub
parent 31228ce560
commit e76ef93a83
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
selfdrive/ui/qt/onroad.cc
View File

@ -80,11 +80,15 @@ void OnroadWindow::offroadTransition(bool offroad) {
if (!offroad) {
if (map == nullptr && (uiState()->prime_type || !MAPBOX_TOKEN.isEmpty())) {
MapWindow * m = new MapWindow(get_mapbox_settings());
m->setFixedWidth(topWidget(this)->width() / 2);
m->offroadTransition(offroad);
QObject::connect(uiState(), &UIState::offroadTransition, m, &MapWindow::offroadTransition);
split->addWidget(m, 0, Qt::AlignRight);
map = m;
QObject::connect(uiState(), &UIState::offroadTransition, m, &MapWindow::offroadTransition);
m->setFixedWidth(topWidget(this)->width() / 2);
split->addWidget(m, 0, Qt::AlignRight);
// Make map visible after adding to split
m->offroadTransition(offroad);
}
}
#endif

4
selfdrive/ui/ui.cc
View File

@ -208,7 +208,7 @@ void UIState::updateStatus() {
}
// Handle onroad/offroad transition
if (scene.started != started_prev) {
if (scene.started != started_prev || sm->frame == 1) {
if (scene.started) {
status = STATUS_DISENGAGED;
scene.started_frame = sm->frame;
@ -217,8 +217,6 @@ void UIState::updateStatus() {
}
started_prev = scene.started;
emit offroadTransition(!scene.started);
} else if (sm->frame == 1) {
emit offroadTransition(!scene.started);
}
}

2
selfdrive/ui/ui.h
View File

@ -141,7 +141,7 @@ private slots:
private:
QTimer *timer;
bool started_prev = true;
bool started_prev = false;
};
UIState *uiState();