Revert "UI: Indicate when Nav on OP is enabled (#28665)"

This reverts commit a66135665c.
pull/28866/head^2
mitchellgoffpc 2 years ago
parent f2bbb33a8a
commit 1690cf4af6
  1. 23
      selfdrive/ui/qt/onroad.cc
  2. 1
      selfdrive/ui/qt/onroad.h

@ -64,20 +64,9 @@ void OnroadWindow::updateState(const UIState &s) {
nvg->updateState(s); nvg->updateState(s);
// update spacing if (bg != bgColor) {
bool navDisabledNow = (*s.sm)["controlsState"].getControlsState().getEnabled() && // repaint border
!(*s.sm)["modelV2"].getModelV2().getNavEnabled();
if (navDisabled != navDisabledNow) {
split->setSpacing(navDisabledNow ? UI_BORDER_SIZE * 2 : 0);
if (map) {
map->setFixedWidth(topWidget(this)->width() / 2 - UI_BORDER_SIZE * (navDisabledNow ? 2 : 1));
}
}
// repaint border
if (bg != bgColor || navDisabled != navDisabledNow) {
bg = bgColor; bg = bgColor;
navDisabled = navDisabledNow;
update(); update();
} }
} }
@ -90,7 +79,6 @@ void OnroadWindow::mousePressEvent(QMouseEvent* e) {
return; return;
} }
map->setVisible(!sidebarVisible && !map->isVisible()); map->setVisible(!sidebarVisible && !map->isVisible());
update();
} }
#endif #endif
// propagation event to parent(HomeWindow) // propagation event to parent(HomeWindow)
@ -121,13 +109,6 @@ void OnroadWindow::offroadTransition(bool offroad) {
void OnroadWindow::paintEvent(QPaintEvent *event) { void OnroadWindow::paintEvent(QPaintEvent *event) {
QPainter p(this); QPainter p(this);
p.fillRect(rect(), QColor(bg.red(), bg.green(), bg.blue(), 255)); p.fillRect(rect(), QColor(bg.red(), bg.green(), bg.blue(), 255));
if (isMapVisible() && navDisabled) {
QRect map_r = uiState()->scene.map_on_left
? QRect(0, 0, width() / 2, height())
: QRect(width() / 2, 0, width() / 2, height());
p.fillRect(map_r, bg_colors[STATUS_DISENGAGED]);
}
} }
// ***** onroad widgets ***** // ***** onroad widgets *****

@ -129,7 +129,6 @@ private:
QColor bg = bg_colors[STATUS_DISENGAGED]; QColor bg = bg_colors[STATUS_DISENGAGED];
QWidget *map = nullptr; QWidget *map = nullptr;
QHBoxLayout* split; QHBoxLayout* split;
bool navDisabled = false;
private slots: private slots:
void offroadTransition(bool offroad); void offroadTransition(bool offroad);

Loading…
Cancel
Save