From 00dcc94ae650629dd82a0e63ba71d7dbc6d8f23b Mon Sep 17 00:00:00 2001 From: Dean Lee Date: Mon, 22 Mar 2021 11:27:16 +0800 Subject: [PATCH] cleanup ui_draw_vision_event (#20386) --- selfdrive/ui/paint.cc | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/selfdrive/ui/paint.cc b/selfdrive/ui/paint.cc index ae2d5de485..5a8c4541a6 100644 --- a/selfdrive/ui/paint.cc +++ b/selfdrive/ui/paint.cc @@ -208,17 +208,12 @@ static void ui_draw_vision_speed(UIState *s) { } static void ui_draw_vision_event(UIState *s) { - const int viz_event_w = 220; - const int viz_event_x = s->viz_rect.right() - (viz_event_w + bdr_s*2); - const int viz_event_y = s->viz_rect.y + (bdr_s*1.5); if (s->scene.controls_state.getEngageable()) { // draw steering wheel const int bg_wheel_size = 96; - const int bg_wheel_x = viz_event_x + (viz_event_w-bg_wheel_size); - const int bg_wheel_y = viz_event_y + (bg_wheel_size/2); - const NVGcolor color = bg_colors[s->status]; - - ui_draw_circle_image(s, bg_wheel_x, bg_wheel_y, bg_wheel_size, "wheel", color, 1.0f, bg_wheel_y - 25); + const int bg_wheel_x = s->viz_rect.right() - bg_wheel_size - bdr_s * 2; + const int bg_wheel_y = s->viz_rect.y + (bg_wheel_size / 2) + (bdr_s * 1.5); + ui_draw_circle_image(s, bg_wheel_x, bg_wheel_y, bg_wheel_size, "wheel", bg_colors[s->status], 1.0f, bg_wheel_y - 25); } }