zhudongjer/carrot
1
1
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Visuals - Screen Management - Hide UI Elements - Map Icon

Browse Source 
Hide the map icon button on the onroad screen.
This commit is contained in:
FrogAi 2024-05-11 15:42:11 -07:00
parent 3a7a0310a2
commit 998b15405c
3 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -727,7 +727,7 @@ void AnnotatedCameraWidget::updateState(const UIState &s) {
// hide map settings button for alerts and flip for right hand DM // hide map settings button for alerts and flip for right hand DM
if (map_settings_btn->isEnabled()) { if (map_settings_btn->isEnabled()) {
map_settings_btn->setVisible(!hideBottomIcons && compass); map_settings_btn->setVisible(!hideBottomIcons && compass && !scene.hide_map_icon);
main_layout->setAlignment(map_settings_btn, (rightHandDM ? Qt::AlignLeft : Qt::AlignRight) | Qt::AlignTop); main_layout->setAlignment(map_settings_btn, (rightHandDM ? Qt::AlignLeft : Qt::AlignRight) | Qt::AlignTop);
} }
@ -1533,7 +1533,7 @@ void AnnotatedCameraWidget::paintFrogPilotWidgets(QPainter &p) {
map_settings_btn_bottom->setEnabled(map_settings_btn->isEnabled()); map_settings_btn_bottom->setEnabled(map_settings_btn->isEnabled());
if (map_settings_btn_bottom->isEnabled()) { if (map_settings_btn_bottom->isEnabled()) {
map_settings_btn_bottom->setVisible(!hideBottomIcons && !compass); map_settings_btn_bottom->setVisible(!hideBottomIcons && !compass && !scene.hide_map_icon);
bottom_layout->setAlignment(map_settings_btn_bottom, rightHandDM ? Qt::AlignLeft : Qt::AlignRight); bottom_layout->setAlignment(map_settings_btn_bottom, rightHandDM ? Qt::AlignLeft : Qt::AlignRight);
} }
} }

1
selfdrive/ui/ui.cc
View File

@ -411,6 +411,7 @@ void ui_update_frogpilot_params(UIState *s) {
bool screen_management = params.getBool("ScreenManagement"); bool screen_management = params.getBool("ScreenManagement");
bool hide_ui_elements = screen_management && params.getBool("HideUIElements"); bool hide_ui_elements = screen_management && params.getBool("HideUIElements");
scene.hide_alerts = hide_ui_elements && params.getBool("HideAlerts"); scene.hide_alerts = hide_ui_elements && params.getBool("HideAlerts");
scene.hide_map_icon = hide_ui_elements && params.getBool("HideMapIcon");
scene.speed_limit_controller = scene.longitudinal_control && params.getBool("SpeedLimitController"); scene.speed_limit_controller = scene.longitudinal_control && params.getBool("SpeedLimitController");
scene.show_slc_offset = scene.speed_limit_controller && params.getBool("ShowSLCOffset"); scene.show_slc_offset = scene.speed_limit_controller && params.getBool("ShowSLCOffset");

1
selfdrive/ui/ui.h
View File

@ -211,6 +211,7 @@ typedef struct UIScene {
bool has_auto_tune; bool has_auto_tune;
bool hide_alerts; bool hide_alerts;
bool hide_lead_marker; bool hide_lead_marker;
bool hide_map_icon;
bool hide_speed; bool hide_speed;
bool hide_speed_ui; bool hide_speed_ui;
bool holiday_themes; bool holiday_themes;