Skip to content

Remove redundant canvas_set_font calls #21

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
aaronjamt wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Remove redundant canvas_set_font calls #21

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion CAN_Commander_FlipperZero/can_commander/views/dashboard/dashboard_metric.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1519,7 +1519,6 @@ void dashboard_metric_draw(Canvas* canvas, const AppDashboardModel* dashboard) {

canvas_draw_rframe(canvas, 2, 12, 124, 50, 4);

canvas_set_font(canvas, FontSecondary);
canvas_draw_str_aligned(canvas, 64, 18, AlignCenter, AlignTop, dashboard->label);

const bool use_big_value = (strlen(dashboard->value) <= 10U);
Expand Down
7 changes: 0 additions & 7 deletions CAN_Commander_FlipperZero/can_commander/views/dashboard/dashboard_read.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,6 @@ bool dashboard_read_draw(Canvas* canvas, const AppDashboardModel* dashboard) {
if(dashboard->read_overload) {
char fps_text[24] = {0};
snprintf(fps_text, sizeof(fps_text), "Rate: %lu fps", (unsigned long)dashboard->read_rate_fps);
canvas_set_font(canvas, FontSecondary);
canvas_draw_str_aligned(canvas, 64, 24, AlignCenter, AlignCenter, "Input overload");
canvas_draw_str_aligned(canvas, 64, 34, AlignCenter, AlignCenter, fps_text);
canvas_draw_str_aligned(canvas, 64, 45, AlignCenter, AlignCenter, "Rendering paused >1000");
Expand All @@ -166,7 +165,6 @@ bool dashboard_read_draw(Canvas* canvas, const AppDashboardModel* dashboard) {

const AppDashFrameEntry* entry = dashboard_read_get_selected(dashboard);
if(!entry) {
canvas_set_font(canvas, FontSecondary);
canvas_draw_str_aligned(canvas, 64, 26, AlignCenter, AlignCenter, "Waiting for CAN frames");
canvas_draw_str_aligned(canvas, 64, 63, AlignCenter, AlignBottom, "OK Hold L/R Pg U/D Nav");
return true;
Expand All @@ -181,7 +179,6 @@ bool dashboard_read_draw(Canvas* canvas, const AppDashboardModel* dashboard) {
dashboard_format_hex_bytes(entry->data, 4U, 8U, entry->dlc, row_b, sizeof(row_b));
snprintf(ts_line, sizeof(ts_line), "t=%lums", (unsigned long)entry->ts_ms);

canvas_set_font(canvas, FontSecondary);
canvas_draw_str_aligned(canvas, 64, 13, AlignCenter, AlignTop, header);
canvas_draw_str_aligned(canvas, 64, 22, AlignCenter, AlignTop, ts_line);

Expand All @@ -202,7 +199,6 @@ bool dashboard_read_draw(Canvas* canvas, const AppDashboardModel* dashboard) {
} else if(page == 1U) {
canvas_draw_str_aligned(canvas, 64, 2, AlignCenter, AlignTop, "Recent Frames");
if(dashboard->read_count == 0U) {
canvas_set_font(canvas, FontSecondary);
canvas_draw_str_aligned(canvas, 64, 26, AlignCenter, AlignCenter, "No frames yet");
canvas_draw_str_aligned(canvas, 64, 63, AlignCenter, AlignBottom, "L/R Pg OK Hold");
return true;
Expand Down Expand Up @@ -237,11 +233,9 @@ bool dashboard_read_draw(Canvas* canvas, const AppDashboardModel* dashboard) {
(offset == selected) ? '>' : ' ',
preview);

canvas_set_font(canvas, FontSecondary);
canvas_draw_str(canvas, 2, (int32_t)(22 + line * 10U), row);
}

canvas_set_font(canvas, FontSecondary);
canvas_draw_str_aligned(canvas, 64, 63, AlignCenter, AlignBottom, "U/D Sel L/R Pg");
} else {
canvas_draw_str_aligned(canvas, 64, 2, AlignCenter, AlignTop, "Stats");
Expand Down Expand Up @@ -273,7 +267,6 @@ bool dashboard_read_draw(Canvas* canvas, const AppDashboardModel* dashboard) {
snprintf(line4, sizeof(line4), "Feed:%s", dashboard->read_hold ? "Hold" : "Live");
}

canvas_set_font(canvas, FontSecondary);
canvas_draw_str(canvas, 2, 20, line1);
canvas_draw_str(canvas, 2, 31, line2);
canvas_draw_str(canvas, 2, 42, line3);
Expand Down