mawei/sunnypilot
1
0
Fork 0
mirror of https://github.com/sunnypilot/sunnypilot.git synced 2026-09-27 04:33:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix upstream conflict

Browse Source
This commit is contained in:
Jason Wen
2023-05-25 12:48:59 -04:00
parent 141c04e46f
commit dba3eb7a50
2 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
selfdrive/ui/qt/maps/map_settings.cc
+1 -1
View File
@@ -119,7 +119,7 @@ MapPanel::MapPanel(QWidget* parent) : QWidget(parent) {
stack->addWidget(no_prime_widget);
}
connect(uiState(), &UIState::primeTypeChanged, [=](int prime_type) {
stack->setCurrentIndex(!custom_mapbox ? uiState()->prime_type ? 0 : 1 : 1);
stack->setCurrentIndex(!custom_mapbox ? uiState()->primeType() ? 0 : 1 : 1);
});
QVBoxLayout *wrapper = new QVBoxLayout(this);
selfdrive/ui/qt/onroad.cc
-1
View File
@@ -1397,7 +1397,6 @@ void AnnotatedCameraWidget::drawLaneLines(QPainter &painter, const UIState *s) {
// paint path
QLinearGradient bg(0, height(), 0, height() / 4);
float start_hue, end_hue;
if (madsEnabled) {
if (steerOverride && latActive) {
bg.setColorAt(0.0, QColor::fromHslF(20 / 360., 0.94, 0.51, 0.17));