UI:shorten variable name (#19633)
parent
75774b817f
commit
0c4e2fadc8
|
@ -70,7 +70,7 @@ static void handle_vision_touch(UIState *s, int touch_x, int touch_y) {
|
|||
if (s->started && (touch_x >= s->scene.viz_rect.x - bdr_s)
|
||||
&& (s->active_app != cereal::UiLayoutState::App::SETTINGS)) {
|
||||
if (!s->scene.frontview) {
|
||||
s->scene.uilayout_sidebarcollapsed = !s->scene.uilayout_sidebarcollapsed;
|
||||
s->scene.sidebar_collapsed = !s->scene.sidebar_collapsed;
|
||||
} else {
|
||||
Params().write_db_value("IsDriverViewEnabled", "0", 1);
|
||||
}
|
||||
|
@ -78,13 +78,13 @@ static void handle_vision_touch(UIState *s, int touch_x, int touch_y) {
|
|||
}
|
||||
|
||||
static void handle_sidebar_touch(UIState *s, int touch_x, int touch_y) {
|
||||
if (!s->scene.uilayout_sidebarcollapsed && touch_x <= sbr_w) {
|
||||
if (!s->scene.sidebar_collapsed && touch_x <= sbr_w) {
|
||||
if (settings_btn.ptInRect(touch_x, touch_y)) {
|
||||
s->active_app = cereal::UiLayoutState::App::SETTINGS;
|
||||
} else if (home_btn.ptInRect(touch_x, touch_y)) {
|
||||
if (s->started) {
|
||||
s->active_app = cereal::UiLayoutState::App::NONE;
|
||||
s->scene.uilayout_sidebarcollapsed = true;
|
||||
s->scene.sidebar_collapsed = true;
|
||||
} else {
|
||||
s->active_app = cereal::UiLayoutState::App::HOME;
|
||||
}
|
||||
|
@ -99,14 +99,14 @@ static void update_offroad_layout_state(UIState *s, PubMaster *pm) {
|
|||
if (timeout > 0) {
|
||||
timeout--;
|
||||
}
|
||||
if (prev_collapsed != s->scene.uilayout_sidebarcollapsed || prev_app != s->active_app || timeout == 0) {
|
||||
if (prev_collapsed != s->scene.sidebar_collapsed || prev_app != s->active_app || timeout == 0) {
|
||||
MessageBuilder msg;
|
||||
auto layout = msg.initEvent().initUiLayoutState();
|
||||
layout.setActiveApp(s->active_app);
|
||||
layout.setSidebarCollapsed(s->scene.uilayout_sidebarcollapsed);
|
||||
layout.setSidebarCollapsed(s->scene.sidebar_collapsed);
|
||||
pm->send("offroadLayout", msg);
|
||||
LOGD("setting active app to %d with sidebar %d", (int)s->active_app, s->scene.uilayout_sidebarcollapsed);
|
||||
prev_collapsed = s->scene.uilayout_sidebarcollapsed;
|
||||
LOGD("setting active app to %d with sidebar %d", (int)s->active_app, s->scene.sidebar_collapsed);
|
||||
prev_collapsed = s->scene.sidebar_collapsed;
|
||||
prev_app = s->active_app;
|
||||
timeout = 2 * UI_FREQ;
|
||||
}
|
||||
|
|
|
@ -372,7 +372,7 @@ static void ui_draw_vision_face(UIState *s) {
|
|||
|
||||
static void ui_draw_driver_view(UIState *s) {
|
||||
const UIScene *scene = &s->scene;
|
||||
s->scene.uilayout_sidebarcollapsed = true;
|
||||
s->scene.sidebar_collapsed = true;
|
||||
const Rect &viz_rect = s->scene.viz_rect;
|
||||
const int ff_xoffset = 32;
|
||||
const int frame_x = viz_rect.x;
|
||||
|
@ -524,7 +524,7 @@ 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};
|
||||
if (!s->scene.uilayout_sidebarcollapsed) {
|
||||
if (!s->scene.sidebar_collapsed) {
|
||||
s->scene.viz_rect.x += sbr_w;
|
||||
s->scene.viz_rect.w -= sbr_w;
|
||||
}
|
||||
|
|
|
@ -151,13 +151,13 @@ void HomeWindow::mousePressEvent(QMouseEvent *e) {
|
|||
glWindow->wake();
|
||||
|
||||
// Settings button click
|
||||
if (!ui_state->scene.uilayout_sidebarcollapsed && settings_btn.ptInRect(e->x(), e->y())) {
|
||||
if (!ui_state->scene.sidebar_collapsed && settings_btn.ptInRect(e->x(), e->y())) {
|
||||
emit openSettings();
|
||||
}
|
||||
|
||||
// Vision click
|
||||
if (ui_state->started && (e->x() >= ui_state->scene.viz_rect.x - bdr_s)) {
|
||||
ui_state->scene.uilayout_sidebarcollapsed = !ui_state->scene.uilayout_sidebarcollapsed;
|
||||
ui_state->scene.sidebar_collapsed = !ui_state->scene.sidebar_collapsed;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -159,7 +159,7 @@ static void ui_draw_sidebar_connectivity(UIState *s) {
|
|||
}
|
||||
|
||||
void ui_draw_sidebar(UIState *s) {
|
||||
if (s->scene.uilayout_sidebarcollapsed) {
|
||||
if (s->scene.sidebar_collapsed) {
|
||||
return;
|
||||
}
|
||||
ui_draw_sidebar_background(s);
|
||||
|
|
|
@ -191,7 +191,7 @@ void update_sockets(UIState *s) {
|
|||
if (sm.updated("uiLayoutState")) {
|
||||
auto data = sm["uiLayoutState"].getUiLayoutState();
|
||||
s->active_app = data.getActiveApp();
|
||||
scene.uilayout_sidebarcollapsed = data.getSidebarCollapsed();
|
||||
scene.sidebar_collapsed = data.getSidebarCollapsed();
|
||||
}
|
||||
if (sm.updated("thermal")) {
|
||||
scene.thermal = sm["thermal"].getThermal();
|
||||
|
@ -260,14 +260,14 @@ void ui_update(UIState *s) {
|
|||
if (!s->started && s->status != STATUS_OFFROAD) {
|
||||
s->status = STATUS_OFFROAD;
|
||||
s->active_app = cereal::UiLayoutState::App::HOME;
|
||||
s->scene.uilayout_sidebarcollapsed = false;
|
||||
s->scene.sidebar_collapsed = false;
|
||||
s->sound->stop();
|
||||
} else if (s->started && s->status == STATUS_OFFROAD) {
|
||||
s->status = STATUS_DISENGAGED;
|
||||
s->started_frame = s->sm->frame;
|
||||
|
||||
s->active_app = cereal::UiLayoutState::App::NONE;
|
||||
s->scene.uilayout_sidebarcollapsed = true;
|
||||
s->scene.sidebar_collapsed = true;
|
||||
s->alert_blinked = false;
|
||||
s->alert_blinking_alpha = 1.0;
|
||||
s->scene.alert_size = cereal::ControlsState::AlertSize::NONE;
|
||||
|
|
|
@ -99,7 +99,7 @@ typedef struct UIScene {
|
|||
|
||||
bool is_rhd;
|
||||
bool frontview;
|
||||
bool uilayout_sidebarcollapsed;
|
||||
bool sidebar_collapsed;
|
||||
// responsive layout
|
||||
Rect viz_rect;
|
||||
|
||||
|
|
Loading…
Reference in New Issue