From 232cb25683ef59a4cc1ce6a7a98eeb57a78a9968 Mon Sep 17 00:00:00 2001 From: Dean Lee Date: Tue, 8 Dec 2020 21:20:06 +0800 Subject: [PATCH] small cleanup (#2715) --- selfdrive/ui/paint.cc | 6 ++---- selfdrive/ui/ui.hpp | 1 - 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/selfdrive/ui/paint.cc b/selfdrive/ui/paint.cc index fb03390ae1..a953450f1d 100644 --- a/selfdrive/ui/paint.cc +++ b/selfdrive/ui/paint.cc @@ -532,11 +532,9 @@ static void ui_draw_background(UIState *s) { void ui_draw(UIState *s) { s->scene.viz_rect = Rect{bdr_s, bdr_s, s->fb_w - 2 * bdr_s, s->fb_h - 2 * bdr_s}; - s->scene.ui_viz_ro = 0; if (!s->scene.uilayout_sidebarcollapsed) { - s->scene.viz_rect.x = sbr_w + bdr_s; - s->scene.viz_rect.w = s->fb_w - s->scene.viz_rect.x - bdr_s; - s->scene.ui_viz_ro = -(sbr_w - 6 * bdr_s); + s->scene.viz_rect.x += sbr_w; + s->scene.viz_rect.w -= sbr_w; } const bool draw_vision = s->started && s->active_app == cereal::UiLayoutState::App::NONE && diff --git a/selfdrive/ui/ui.hpp b/selfdrive/ui/ui.hpp index eccb4c1655..b18e51f208 100644 --- a/selfdrive/ui/ui.hpp +++ b/selfdrive/ui/ui.hpp @@ -98,7 +98,6 @@ typedef struct UIScene { bool uilayout_sidebarcollapsed; // responsive layout Rect viz_rect; - int ui_viz_ro; std::string alert_text1; std::string alert_text2;