parent
c80d9f132c
commit
6159906e5f
|
@ -53,6 +53,7 @@ one
|
||||||
openpilot
|
openpilot
|
||||||
notebooks
|
notebooks
|
||||||
xx
|
xx
|
||||||
|
hyperthneed
|
||||||
panda_jungle
|
panda_jungle
|
||||||
apks
|
apks
|
||||||
openpilot-apks
|
openpilot-apks
|
||||||
|
|
|
@ -529,7 +529,7 @@ static void ui_draw_background(UIState *s) {
|
||||||
}
|
}
|
||||||
|
|
||||||
void ui_draw(UIState *s) {
|
void ui_draw(UIState *s) {
|
||||||
s->scene.viz_rect = Rect{bdr_s * 3, bdr_s, s->fb_w - 4 * bdr_s, s->fb_h - 2 * bdr_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;
|
s->scene.ui_viz_ro = 0;
|
||||||
if (!s->scene.uilayout_sidebarcollapsed) {
|
if (!s->scene.uilayout_sidebarcollapsed) {
|
||||||
s->scene.viz_rect.x = sbr_w + bdr_s;
|
s->scene.viz_rect.x = sbr_w + bdr_s;
|
||||||
|
@ -727,7 +727,7 @@ void ui_nvg_init(UIState *s) {
|
||||||
glBindVertexArray(0);
|
glBindVertexArray(0);
|
||||||
}
|
}
|
||||||
|
|
||||||
s->video_rect = Rect{bdr_s * 3, bdr_s, s->fb_w - 4 * bdr_s, s->fb_h - 2 * bdr_s};
|
s->video_rect = Rect{bdr_s, bdr_s, s->fb_w - 2 * bdr_s, s->fb_h - 2 * bdr_s};
|
||||||
float zx = zoom * 2 * intrinsic_matrix.v[2] / s->video_rect.w;
|
float zx = zoom * 2 * intrinsic_matrix.v[2] / s->video_rect.w;
|
||||||
float zy = zoom * 2 * intrinsic_matrix.v[5] / s->video_rect.h;
|
float zy = zoom * 2 * intrinsic_matrix.v[5] / s->video_rect.h;
|
||||||
|
|
||||||
|
|
|
@ -7,8 +7,7 @@
|
||||||
#include "sidebar.hpp"
|
#include "sidebar.hpp"
|
||||||
|
|
||||||
static void ui_draw_sidebar_background(UIState *s) {
|
static void ui_draw_sidebar_background(UIState *s) {
|
||||||
int sbr_x = !s->scene.uilayout_sidebarcollapsed ? 0 : -(sbr_w) + bdr_s * 2;
|
ui_draw_rect(s->vg, 0, 0, sbr_w, s->fb_h, COLOR_BLACK_ALPHA(85));
|
||||||
ui_draw_rect(s->vg, sbr_x, 0, sbr_w, s->fb_h, COLOR_BLACK_ALPHA(85));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static void ui_draw_sidebar_settings_button(UIState *s) {
|
static void ui_draw_sidebar_settings_button(UIState *s) {
|
||||||
|
@ -155,10 +154,10 @@ static void ui_draw_sidebar_connectivity(UIState *s) {
|
||||||
}
|
}
|
||||||
|
|
||||||
void ui_draw_sidebar(UIState *s) {
|
void ui_draw_sidebar(UIState *s) {
|
||||||
ui_draw_sidebar_background(s);
|
|
||||||
if (s->scene.uilayout_sidebarcollapsed) {
|
if (s->scene.uilayout_sidebarcollapsed) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
ui_draw_sidebar_background(s);
|
||||||
ui_draw_sidebar_settings_button(s);
|
ui_draw_sidebar_settings_button(s);
|
||||||
ui_draw_sidebar_home_button(s);
|
ui_draw_sidebar_home_button(s);
|
||||||
ui_draw_sidebar_network_strength(s);
|
ui_draw_sidebar_network_strength(s);
|
||||||
|
|
Loading…
Reference in New Issue