From 20918d82b689c09c33a0fecef102fc91a65b00d5 Mon Sep 17 00:00:00 2001 From: Dean Lee Date: Tue, 5 Jan 2021 20:27:15 +0800 Subject: [PATCH] cleanup draw alert (#19655) * cleanup * use Rect * Revert "use Rect" This reverts commit 96d04339a0adc7f7f543828ae8ff8101dd9f5f60. * remove None from static map --- selfdrive/ui/paint.cc | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/selfdrive/ui/paint.cc b/selfdrive/ui/paint.cc index a862a8985..18dd91191 100644 --- a/selfdrive/ui/paint.cc +++ b/selfdrive/ui/paint.cc @@ -416,7 +416,6 @@ static void ui_draw_vision_footer(UIState *s) { static void ui_draw_vision_alert(UIState *s) { static std::map alert_size_map = { - {cereal::ControlsState::AlertSize::NONE, 0}, {cereal::ControlsState::AlertSize::SMALL, 241}, {cereal::ControlsState::AlertSize::MID, 390}, {cereal::ControlsState::AlertSize::FULL, s->fb_h}}; @@ -428,9 +427,9 @@ static void ui_draw_vision_alert(UIState *s) { int alr_s = alert_size_map[scene->alert_size]; const int alr_x = scene->viz_rect.x - bdr_s; - const int alr_w = scene->viz_rect.w + (bdr_s*2); - const int alr_h = alr_s+(scene->alert_size==cereal::ControlsState::AlertSize::NONE?0:bdr_s); - const int alr_y = s->fb_h-alr_h; + const int alr_w = scene->viz_rect.w + (bdr_s * 2); + const int alr_h = alr_s + bdr_s; + const int alr_y = s->fb_h - alr_h; ui_draw_rect(s->vg, alr_x, alr_y, alr_w, alr_h, color);