mawei/sunnypilot
1
0
Fork 0
mirror of https://github.com/sunnypilot/sunnypilot.git synced 2026-10-11 08:53:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

confirmed to work

Browse Source
This commit is contained in:
Jason Wen
2024-06-27 00:19:41 -04:00
parent b91a134b63
commit ecdf0bdecc
1 changed files with 20 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
selfdrive/ui/qt/onroad/annotated_camera.cc
+20 -8
View File
@@ -84,13 +84,23 @@ void AnnotatedCameraWidget::updateButtonsLayout(bool is_rhd) {
buttons_layout->setContentsMargins(0, 0, 10, rn_offset != 0 ? rn_offset + 10 : 20);
buttons_layout->addSpacing(onroad_settings_btn->isVisible() ? 216 : 0);
buttons_layout->addWidget(onroad_settings_btn, 0, Qt::AlignBottom | (is_rhd ? Qt::AlignRight : Qt::AlignLeft));
if (is_rhd) {
buttons_layout->addSpacing(map_settings_btn->isVisible() ? 30 : 0);
buttons_layout->addWidget(map_settings_btn, 0, Qt::AlignBottom | Qt::AlignLeft);
buttons_layout->addStretch(1);
buttons_layout->addStretch(1);
buttons_layout->addSpacing(map_settings_btn->isVisible() ? 30 : 0);
buttons_layout->addWidget(map_settings_btn, 0, Qt::AlignBottom | (is_rhd ? Qt::AlignLeft : Qt::AlignRight));
buttons_layout->addWidget(onroad_settings_btn, 0, Qt::AlignBottom | Qt::AlignRight);
buttons_layout->addSpacing(onroad_settings_btn->isVisible() ? 216 : 0);
} else {
buttons_layout->addSpacing(onroad_settings_btn->isVisible() ? 216 : 0);
buttons_layout->addWidget(onroad_settings_btn, 0, Qt::AlignBottom | Qt::AlignLeft);
buttons_layout->addStretch(1);
buttons_layout->addWidget(map_settings_btn, 0, Qt::AlignBottom | Qt::AlignRight);
buttons_layout->addSpacing(map_settings_btn->isVisible() ? 30 : 0); // Add spacing to the right
}
}
void AnnotatedCameraWidget::updateState(const UIState &s) {
@@ -205,13 +215,13 @@ void AnnotatedCameraWidget::updateState(const UIState &s) {
// hide map settings button for alerts and flip for right hand DM
if (map_settings_btn->isEnabled()) {
map_settings_btn->setVisible(!hideBottomIcons);
main_layout->setAlignment(map_settings_btn, (rightHandDM ? Qt::AlignLeft : Qt::AlignRight) | Qt::AlignBottom);
buttons_layout->setAlignment(map_settings_btn, (rightHandDM ? Qt::AlignLeft : Qt::AlignRight) | Qt::AlignBottom);
}
// hide onroad settings button for alerts and flip for right hand DM
if (onroad_settings_btn->isEnabled()) {
onroad_settings_btn->setVisible(!hideBottomIcons);
main_layout->setAlignment(onroad_settings_btn, (rightHandDM ? Qt::AlignRight : Qt::AlignLeft) | Qt::AlignBottom);
buttons_layout->setAlignment(onroad_settings_btn, (rightHandDM ? Qt::AlignRight : Qt::AlignLeft) | Qt::AlignBottom);
}
const auto lp_sp = sm["longitudinalPlanSP"].getLongitudinalPlanSP();
@@ -543,7 +553,9 @@ void AnnotatedCameraWidget::drawHud(QPainter &p) {
}
if (!hideBottomIcons && featureStatusToggle) {
drawFeatureStatusText(p, UI_BORDER_SIZE * 2 + 370, rect().bottom() - 160 - rn_offset);
int x = UI_BORDER_SIZE * 2 + (rightHandDM ? 600 : 370);
int feature_status_text_x = rightHandDM ? rect().right() - x : x;
drawFeatureStatusText(p, feature_status_text_x, rect().bottom() - 160 - rn_offset);
}
p.restore();