From fec247882ec85278c8cd57a929de6395f46cccc9 Mon Sep 17 00:00:00 2001 From: Willy-JL <49810075+Willy-JL@users.noreply.github.com> Date: Wed, 20 Mar 2024 22:02:08 +0000 Subject: [PATCH 1/5] GUI: Fix elements module for new canvas API --- applications/services/gui/elements.c | 93 +++++++++++++--------------- applications/services/gui/elements.h | 69 ++++++++++----------- 2 files changed, 76 insertions(+), 86 deletions(-) diff --git a/applications/services/gui/elements.c b/applications/services/gui/elements.c index dfdd6c034..9ecec3f20 100644 --- a/applications/services/gui/elements.c +++ b/applications/services/gui/elements.c @@ -27,7 +27,7 @@ typedef struct { const char* text; } ElementTextBoxLine; -void elements_progress_bar(Canvas* canvas, uint8_t x, uint8_t y, uint8_t width, float progress) { +void elements_progress_bar(Canvas* canvas, int32_t x, int32_t y, size_t width, float progress) { furi_check(canvas); furi_check((progress >= 0.0f) && (progress <= 1.0f)); uint8_t height = 9; @@ -44,9 +44,9 @@ void elements_progress_bar(Canvas* canvas, uint8_t x, uint8_t y, uint8_t width, void elements_progress_bar_with_text( Canvas* canvas, - uint8_t x, - uint8_t y, - uint8_t width, + int32_t x, + int32_t y, + size_t width, float progress, const char* text) { furi_check(canvas); @@ -69,9 +69,9 @@ void elements_progress_bar_with_text( void elements_scrollbar_pos( Canvas* canvas, - uint8_t x, - uint8_t y, - uint8_t height, + int32_t x, + int32_t y, + size_t height, uint16_t pos, uint16_t total) { furi_check(canvas); @@ -110,7 +110,7 @@ void elements_scrollbar(Canvas* canvas, uint16_t pos, uint16_t total) { } } -void elements_frame(Canvas* canvas, uint8_t x, uint8_t y, uint8_t width, uint8_t height) { +void elements_frame(Canvas* canvas, int32_t x, int32_t y, size_t width, size_t height) { furi_check(canvas); canvas_draw_line(canvas, x + 2, y, x + width - 2, y); @@ -261,8 +261,8 @@ static size_t void elements_multiline_text_aligned( Canvas* canvas, - uint8_t x, - uint8_t y, + int32_t x, + int32_t y, Align horizontal, Align vertical, const char* text) { @@ -293,7 +293,7 @@ void elements_multiline_text_aligned( if((start[chars_fit] == '\n') || (start[chars_fit] == 0)) { line = furi_string_alloc_printf("%.*s", chars_fit, start); - } else if((y + font_height) > canvas_height(canvas)) { + } else if((y + font_height) > (int32_t)canvas_height(canvas)) { line = furi_string_alloc_printf("%.*s...\n", chars_fit, start); } else { chars_fit -= 1; // account for the dash @@ -302,7 +302,7 @@ void elements_multiline_text_aligned( canvas_draw_str_aligned(canvas, x, y, horizontal, vertical, furi_string_get_cstr(line)); furi_string_free(line); y += font_height; - if(y > canvas_height(canvas)) { + if(y > (int32_t)canvas_height(canvas)) { break; } @@ -311,7 +311,7 @@ void elements_multiline_text_aligned( } } -void elements_multiline_text(Canvas* canvas, uint8_t x, uint8_t y, const char* text) { +void elements_multiline_text(Canvas* canvas, int32_t x, int32_t y, const char* text) { furi_check(canvas); furi_check(text); @@ -334,7 +334,7 @@ void elements_multiline_text(Canvas* canvas, uint8_t x, uint8_t y, const char* t furi_string_free(str); } -void elements_multiline_text_framed(Canvas* canvas, uint8_t x, uint8_t y, const char* text) { +void elements_multiline_text_framed(Canvas* canvas, int32_t x, int32_t y, const char* text) { furi_check(canvas); furi_check(text); @@ -361,30 +361,25 @@ void elements_multiline_text_framed(Canvas* canvas, uint8_t x, uint8_t y, const void elements_slightly_rounded_frame( Canvas* canvas, - uint8_t x, - uint8_t y, - uint8_t width, - uint8_t height) { + int32_t x, + int32_t y, + size_t width, + size_t height) { furi_check(canvas); canvas_draw_rframe(canvas, x, y, width, height, 1); } void elements_slightly_rounded_box( Canvas* canvas, - uint8_t x, - uint8_t y, - uint8_t width, - uint8_t height) { + int32_t x, + int32_t y, + size_t width, + size_t height) { furi_check(canvas); canvas_draw_rbox(canvas, x, y, width, height, 1); } -void elements_bold_rounded_frame( - Canvas* canvas, - uint8_t x, - uint8_t y, - uint8_t width, - uint8_t height) { +void elements_bold_rounded_frame(Canvas* canvas, int32_t x, int32_t y, size_t width, size_t height) { furi_check(canvas); canvas_set_color(canvas, ColorWhite); @@ -433,8 +428,8 @@ void elements_bubble(Canvas* canvas, uint8_t x, uint8_t y, uint8_t width, uint8_ void elements_bubble_str( Canvas* canvas, - uint8_t x, - uint8_t y, + int32_t x, + int32_t y, const char* text, Align horizontal, Align vertical) { @@ -582,10 +577,10 @@ void elements_string_fit_width(Canvas* canvas, FuriString* string, uint8_t width void elements_scrollable_text_line( Canvas* canvas, - uint8_t x, - uint8_t y, - uint8_t width, - FuriString* string, + int32_t x, + int32_t y, + size_t width, + const char* string, size_t scroll, bool ellipsis) { furi_check(canvas); @@ -632,10 +627,10 @@ void elements_scrollable_text_line( void elements_text_box( Canvas* canvas, - uint8_t x, - uint8_t y, - uint8_t width, - uint8_t height, + int32_t x, + int32_t y, + size_t width, + size_t height, Align horizontal, Align vertical, const char* text, @@ -645,8 +640,8 @@ void elements_text_box( ElementTextBoxLine line[ELEMENTS_MAX_LINES_NUM]; bool bold = false; bool mono = false; - bool inversed = false; - bool inversed_present = false; + bool inverse = false; + bool inverse_present = false; Font current_font = FontSecondary; Font prev_font = FontSecondary; const CanvasFontParameters* font_params = canvas_get_font_params(canvas, current_font); @@ -702,8 +697,8 @@ void elements_text_box( canvas_set_font(canvas, FontKeyboard); mono = !mono; } - if(text[i] == ELEMENTS_INVERSED_MARKER) { - inversed_present = true; + if(text[i] == ELEMENTS_INVERSE_MARKER) { + inverse_present = true; } continue; } @@ -719,10 +714,10 @@ void elements_text_box( if(text[i] == '\0') { full_text_processed = true; } - if(inversed_present) { + if(inverse_present) { line_leading_min += 1; line_leading_default += 1; - inversed_present = false; + inverse_present = false; } line[line_num].leading_min = line_leading_min; line[line_num].leading_default = line_leading_default; @@ -785,7 +780,7 @@ void elements_text_box( canvas_set_font(canvas, FontSecondary); bold = false; mono = false; - inversed = false; + inverse = false; for(uint8_t i = 0; i < line_num; i++) { for(uint8_t j = 0; j < line[i].len; j++) { // Process format symbols @@ -809,11 +804,11 @@ void elements_text_box( mono = !mono; continue; } - if(line[i].text[j] == ELEMENTS_INVERSED_MARKER) { - inversed = !inversed; + if(line[i].text[j] == ELEMENTS_INVERSE_MARKER) { + inverse = !inverse; continue; } - if(inversed) { + if(inverse) { canvas_draw_box( canvas, line[i].x - 1, @@ -826,7 +821,7 @@ void elements_text_box( } else { if((i == line_num - 1) && strip_to_dots) { uint8_t next_symbol_width = canvas_glyph_width(canvas, line[i].text[j]); - if(line[i].x + next_symbol_width + dots_width > x + width) { + if(line[i].x + next_symbol_width + dots_width > x + (int32_t)width) { canvas_draw_str(canvas, line[i].x, line[i].y, "..."); break; } diff --git a/applications/services/gui/elements.h b/applications/services/gui/elements.h index dbaf6d681..cda70dbb2 100644 --- a/applications/services/gui/elements.h +++ b/applications/services/gui/elements.h @@ -19,7 +19,7 @@ extern "C" { #define ELEMENTS_MAX_LINES_NUM (7) #define ELEMENTS_BOLD_MARKER '#' #define ELEMENTS_MONO_MARKER '*' -#define ELEMENTS_INVERSED_MARKER '!' +#define ELEMENTS_INVERSE_MARKER '!' /** Draw progress bar. * @@ -29,7 +29,7 @@ extern "C" { * @param width progress bar width * @param progress progress (0.0 - 1.0) */ -void elements_progress_bar(Canvas* canvas, uint8_t x, uint8_t y, uint8_t width, float progress); +void elements_progress_bar(Canvas* canvas, int32_t x, int32_t y, size_t width, float progress); /** Draw progress bar with text. * @@ -42,9 +42,9 @@ void elements_progress_bar(Canvas* canvas, uint8_t x, uint8_t y, uint8_t width, */ void elements_progress_bar_with_text( Canvas* canvas, - uint8_t x, - uint8_t y, - uint8_t width, + int32_t x, + int32_t y, + size_t width, float progress, const char* text); @@ -59,9 +59,9 @@ void elements_progress_bar_with_text( */ void elements_scrollbar_pos( Canvas* canvas, - uint8_t x, - uint8_t y, - uint8_t height, + int32_t x, + int32_t y, + size_t height, uint16_t pos, uint16_t total); @@ -80,7 +80,7 @@ void elements_scrollbar(Canvas* canvas, uint16_t pos, uint16_t total); * @param x, y top left corner coordinates * @param width, height frame width and height */ -void elements_frame(Canvas* canvas, uint8_t x, uint8_t y, uint8_t width, uint8_t height); +void elements_frame(Canvas* canvas, int32_t x, int32_t y, size_t width, size_t height); /** Draw button in left corner * @@ -112,8 +112,8 @@ void elements_button_center(Canvas* canvas, const char* str); */ void elements_multiline_text_aligned( Canvas* canvas, - uint8_t x, - uint8_t y, + int32_t x, + int32_t y, Align horizontal, Align vertical, const char* text); @@ -124,7 +124,7 @@ void elements_multiline_text_aligned( * @param x, y top left corner coordinates * @param text string (possible multiline) */ -void elements_multiline_text(Canvas* canvas, uint8_t x, uint8_t y, const char* text); +void elements_multiline_text(Canvas* canvas, int32_t x, int32_t y, const char* text); /** Draw framed multiline text * @@ -132,7 +132,7 @@ void elements_multiline_text(Canvas* canvas, uint8_t x, uint8_t y, const char* t * @param x, y top left corner coordinates * @param text string (possible multiline) */ -void elements_multiline_text_framed(Canvas* canvas, uint8_t x, uint8_t y, const char* text); +void elements_multiline_text_framed(Canvas* canvas, int32_t x, int32_t y, const char* text); /** Draw slightly rounded frame * @@ -142,10 +142,10 @@ void elements_multiline_text_framed(Canvas* canvas, uint8_t x, uint8_t y, const */ void elements_slightly_rounded_frame( Canvas* canvas, - uint8_t x, - uint8_t y, - uint8_t width, - uint8_t height); + int32_t x, + int32_t y, + size_t width, + size_t height); /** Draw slightly rounded box * @@ -155,10 +155,10 @@ void elements_slightly_rounded_frame( */ void elements_slightly_rounded_box( Canvas* canvas, - uint8_t x, - uint8_t y, - uint8_t width, - uint8_t height); + int32_t x, + int32_t y, + size_t width, + size_t height); /** Draw bold rounded frame * @@ -166,12 +166,7 @@ void elements_slightly_rounded_box( * @param x, y top left corner coordinates * @param width, height size of frame */ -void elements_bold_rounded_frame( - Canvas* canvas, - uint8_t x, - uint8_t y, - uint8_t width, - uint8_t height); +void elements_bold_rounded_frame(Canvas* canvas, int32_t x, int32_t y, size_t width, size_t height); /** Draw bubble frame for text * @@ -194,8 +189,8 @@ void elements_bubble(Canvas* canvas, uint8_t x, uint8_t y, uint8_t width, uint8_ */ void elements_bubble_str( Canvas* canvas, - uint8_t x, - uint8_t y, + int32_t x, + int32_t y, const char* text, Align horizontal, Align vertical); @@ -220,9 +215,9 @@ void elements_string_fit_width(Canvas* canvas, FuriString* string, uint8_t width */ void elements_scrollable_text_line( Canvas* canvas, - uint8_t x, - uint8_t y, - uint8_t width, + int32_t x, + int32_t y, + size_t width, FuriString* string, size_t scroll, bool ellipsis); @@ -239,15 +234,15 @@ void elements_scrollable_text_line( * @param[in] text Formatted text. The following formats are available: * "\e#Bold text\e#" - bold font is used * "\e*Monospaced text\e*" - monospaced font is used - * "\e!Inversed text\e!" - white text on black background + * "\e!Inverted text\e!" - white text on black background * @param strip_to_dots Strip text to ... if does not fit to width */ void elements_text_box( Canvas* canvas, - uint8_t x, - uint8_t y, - uint8_t width, - uint8_t height, + int32_t x, + int32_t y, + size_t width, + size_t height, Align horizontal, Align vertical, const char* text, From f3a31eeca0b5d2e4544d683afba2ad0dde23af08 Mon Sep 17 00:00:00 2001 From: Willy-JL <49810075+Willy-JL@users.noreply.github.com> Date: Wed, 20 Mar 2024 22:17:27 +0000 Subject: [PATCH 2/5] Oops --- applications/services/gui/elements.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/applications/services/gui/elements.c b/applications/services/gui/elements.c index 9ecec3f20..7f3b7b368 100644 --- a/applications/services/gui/elements.c +++ b/applications/services/gui/elements.c @@ -580,7 +580,7 @@ void elements_scrollable_text_line( int32_t x, int32_t y, size_t width, - const char* string, + FuriString* string, size_t scroll, bool ellipsis) { furi_check(canvas); From 2cfb31a18e4d7e2c3b4e821c06e750c6037f53c2 Mon Sep 17 00:00:00 2001 From: Willy-JL <49810075+Willy-JL@users.noreply.github.com> Date: Wed, 20 Mar 2024 22:28:08 +0000 Subject: [PATCH 3/5] Update symbols --- targets/f7/api_symbols.csv | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/targets/f7/api_symbols.csv b/targets/f7/api_symbols.csv index 8c03a6676..8270cd9be 100644 --- a/targets/f7/api_symbols.csv +++ b/targets/f7/api_symbols.csv @@ -1,5 +1,5 @@ entry,status,name,type,params -Version,+,59.0,, +Version,+,60.0,, Header,+,applications/drivers/subghz/cc1101_ext/cc1101_ext_interconnect.h,, Header,+,applications/services/bt/bt_service/bt.h,, Header,+,applications/services/cli/cli.h,, @@ -920,25 +920,25 @@ Function,-,dprintf,int,"int, const char*, ..." Function,-,drand48,double, Function,-,drem,double,"double, double" Function,-,dremf,float,"float, float" -Function,+,elements_bold_rounded_frame,void,"Canvas*, uint8_t, uint8_t, uint8_t, uint8_t" +Function,+,elements_bold_rounded_frame,void,"Canvas*, int32_t, int32_t, size_t, size_t" Function,+,elements_bubble,void,"Canvas*, uint8_t, uint8_t, uint8_t, uint8_t" -Function,+,elements_bubble_str,void,"Canvas*, uint8_t, uint8_t, const char*, Align, Align" +Function,+,elements_bubble_str,void,"Canvas*, int32_t, int32_t, const char*, Align, Align" Function,+,elements_button_center,void,"Canvas*, const char*" Function,+,elements_button_left,void,"Canvas*, const char*" Function,+,elements_button_right,void,"Canvas*, const char*" -Function,+,elements_frame,void,"Canvas*, uint8_t, uint8_t, uint8_t, uint8_t" -Function,+,elements_multiline_text,void,"Canvas*, uint8_t, uint8_t, const char*" -Function,+,elements_multiline_text_aligned,void,"Canvas*, uint8_t, uint8_t, Align, Align, const char*" -Function,+,elements_multiline_text_framed,void,"Canvas*, uint8_t, uint8_t, const char*" -Function,+,elements_progress_bar,void,"Canvas*, uint8_t, uint8_t, uint8_t, float" -Function,+,elements_progress_bar_with_text,void,"Canvas*, uint8_t, uint8_t, uint8_t, float, const char*" -Function,+,elements_scrollable_text_line,void,"Canvas*, uint8_t, uint8_t, uint8_t, FuriString*, size_t, _Bool" +Function,+,elements_frame,void,"Canvas*, int32_t, int32_t, size_t, size_t" +Function,+,elements_multiline_text,void,"Canvas*, int32_t, int32_t, const char*" +Function,+,elements_multiline_text_aligned,void,"Canvas*, int32_t, int32_t, Align, Align, const char*" +Function,+,elements_multiline_text_framed,void,"Canvas*, int32_t, int32_t, const char*" +Function,+,elements_progress_bar,void,"Canvas*, int32_t, int32_t, size_t, float" +Function,+,elements_progress_bar_with_text,void,"Canvas*, int32_t, int32_t, size_t, float, const char*" +Function,+,elements_scrollable_text_line,void,"Canvas*, int32_t, int32_t, size_t, FuriString*, size_t, _Bool" Function,+,elements_scrollbar,void,"Canvas*, uint16_t, uint16_t" -Function,+,elements_scrollbar_pos,void,"Canvas*, uint8_t, uint8_t, uint8_t, uint16_t, uint16_t" -Function,+,elements_slightly_rounded_box,void,"Canvas*, uint8_t, uint8_t, uint8_t, uint8_t" -Function,+,elements_slightly_rounded_frame,void,"Canvas*, uint8_t, uint8_t, uint8_t, uint8_t" +Function,+,elements_scrollbar_pos,void,"Canvas*, int32_t, int32_t, size_t, uint16_t, uint16_t" +Function,+,elements_slightly_rounded_box,void,"Canvas*, int32_t, int32_t, size_t, size_t" +Function,+,elements_slightly_rounded_frame,void,"Canvas*, int32_t, int32_t, size_t, size_t" Function,+,elements_string_fit_width,void,"Canvas*, FuriString*, uint8_t" -Function,+,elements_text_box,void,"Canvas*, uint8_t, uint8_t, uint8_t, uint8_t, Align, Align, const char*, _Bool" +Function,+,elements_text_box,void,"Canvas*, int32_t, int32_t, size_t, size_t, Align, Align, const char*, _Bool" Function,+,elf_resolve_from_hashtable,_Bool,"const ElfApiInterface*, uint32_t, Elf32_Addr*" Function,+,elf_symbolname_hash,uint32_t,const char* Function,+,empty_screen_alloc,EmptyScreen*, From 3da03da5fb4c28ab424dbacf7a8d69b443984515 Mon Sep 17 00:00:00 2001 From: Willy-JL <49810075+Willy-JL@users.noreply.github.com> Date: Wed, 20 Mar 2024 22:35:19 +0000 Subject: [PATCH 4/5] Update f18 symbols --- targets/f18/api_symbols.csv | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/targets/f18/api_symbols.csv b/targets/f18/api_symbols.csv index 2a30a7690..da579d730 100644 --- a/targets/f18/api_symbols.csv +++ b/targets/f18/api_symbols.csv @@ -1,5 +1,5 @@ entry,status,name,type,params -Version,+,59.0,, +Version,+,60.0,, Header,+,applications/services/bt/bt_service/bt.h,, Header,+,applications/services/cli/cli.h,, Header,+,applications/services/cli/cli_vcp.h,, @@ -852,25 +852,25 @@ Function,-,dprintf,int,"int, const char*, ..." Function,-,drand48,double, Function,-,drem,double,"double, double" Function,-,dremf,float,"float, float" -Function,+,elements_bold_rounded_frame,void,"Canvas*, uint8_t, uint8_t, uint8_t, uint8_t" +Function,+,elements_bold_rounded_frame,void,"Canvas*, int32_t, int32_t, size_t, size_t" Function,+,elements_bubble,void,"Canvas*, uint8_t, uint8_t, uint8_t, uint8_t" -Function,+,elements_bubble_str,void,"Canvas*, uint8_t, uint8_t, const char*, Align, Align" +Function,+,elements_bubble_str,void,"Canvas*, int32_t, int32_t, const char*, Align, Align" Function,+,elements_button_center,void,"Canvas*, const char*" Function,+,elements_button_left,void,"Canvas*, const char*" Function,+,elements_button_right,void,"Canvas*, const char*" -Function,+,elements_frame,void,"Canvas*, uint8_t, uint8_t, uint8_t, uint8_t" -Function,+,elements_multiline_text,void,"Canvas*, uint8_t, uint8_t, const char*" -Function,+,elements_multiline_text_aligned,void,"Canvas*, uint8_t, uint8_t, Align, Align, const char*" -Function,+,elements_multiline_text_framed,void,"Canvas*, uint8_t, uint8_t, const char*" -Function,+,elements_progress_bar,void,"Canvas*, uint8_t, uint8_t, uint8_t, float" -Function,+,elements_progress_bar_with_text,void,"Canvas*, uint8_t, uint8_t, uint8_t, float, const char*" -Function,+,elements_scrollable_text_line,void,"Canvas*, uint8_t, uint8_t, uint8_t, FuriString*, size_t, _Bool" +Function,+,elements_frame,void,"Canvas*, int32_t, int32_t, size_t, size_t" +Function,+,elements_multiline_text,void,"Canvas*, int32_t, int32_t, const char*" +Function,+,elements_multiline_text_aligned,void,"Canvas*, int32_t, int32_t, Align, Align, const char*" +Function,+,elements_multiline_text_framed,void,"Canvas*, int32_t, int32_t, const char*" +Function,+,elements_progress_bar,void,"Canvas*, int32_t, int32_t, size_t, float" +Function,+,elements_progress_bar_with_text,void,"Canvas*, int32_t, int32_t, size_t, float, const char*" +Function,+,elements_scrollable_text_line,void,"Canvas*, int32_t, int32_t, size_t, FuriString*, size_t, _Bool" Function,+,elements_scrollbar,void,"Canvas*, uint16_t, uint16_t" -Function,+,elements_scrollbar_pos,void,"Canvas*, uint8_t, uint8_t, uint8_t, uint16_t, uint16_t" -Function,+,elements_slightly_rounded_box,void,"Canvas*, uint8_t, uint8_t, uint8_t, uint8_t" -Function,+,elements_slightly_rounded_frame,void,"Canvas*, uint8_t, uint8_t, uint8_t, uint8_t" +Function,+,elements_scrollbar_pos,void,"Canvas*, int32_t, int32_t, size_t, uint16_t, uint16_t" +Function,+,elements_slightly_rounded_box,void,"Canvas*, int32_t, int32_t, size_t, size_t" +Function,+,elements_slightly_rounded_frame,void,"Canvas*, int32_t, int32_t, size_t, size_t" Function,+,elements_string_fit_width,void,"Canvas*, FuriString*, uint8_t" -Function,+,elements_text_box,void,"Canvas*, uint8_t, uint8_t, uint8_t, uint8_t, Align, Align, const char*, _Bool" +Function,+,elements_text_box,void,"Canvas*, int32_t, int32_t, size_t, size_t, Align, Align, const char*, _Bool" Function,+,elf_resolve_from_hashtable,_Bool,"const ElfApiInterface*, uint32_t, Elf32_Addr*" Function,+,elf_symbolname_hash,uint32_t,const char* Function,+,empty_screen_alloc,EmptyScreen*, From 2e9855972e03bd3086db20789af5257186b13311 Mon Sep 17 00:00:00 2001 From: Aleksandr Kutuzov Date: Fri, 22 Mar 2024 18:54:37 +0900 Subject: [PATCH 5/5] Gui: update elements for new canvas --- applications/services/gui/elements.c | 213 ++++++++++++++------------- applications/services/gui/elements.h | 10 +- targets/f18/api_symbols.csv | 8 +- targets/f7/api_symbols.csv | 8 +- 4 files changed, 124 insertions(+), 115 deletions(-) diff --git a/applications/services/gui/elements.c b/applications/services/gui/elements.c index 7f3b7b368..d488cbfc6 100644 --- a/applications/services/gui/elements.c +++ b/applications/services/gui/elements.c @@ -17,29 +17,29 @@ #include typedef struct { - uint8_t x; - uint8_t y; - uint8_t leading_min; - uint8_t leading_default; - uint8_t height; - uint8_t descender; - uint8_t len; + int32_t x; + int32_t y; + int32_t leading_min; + int32_t leading_default; + size_t height; + size_t descender; + size_t len; const char* text; } ElementTextBoxLine; void elements_progress_bar(Canvas* canvas, int32_t x, int32_t y, size_t width, float progress) { furi_check(canvas); furi_check((progress >= 0.0f) && (progress <= 1.0f)); - uint8_t height = 9; + size_t height = 9; - uint8_t progress_length = roundf(progress * (width - 2)); + float progress_width = roundf(progress * (width - 2)); canvas_set_color(canvas, ColorWhite); canvas_draw_box(canvas, x + 1, y + 1, width - 2, height - 2); canvas_set_color(canvas, ColorBlack); canvas_draw_rframe(canvas, x, y, width, height, 3); - canvas_draw_box(canvas, x + 1, y + 1, progress_length, height - 2); + canvas_draw_box(canvas, x + 1, y + 1, progress_width, height - 2); } void elements_progress_bar_with_text( @@ -51,16 +51,16 @@ void elements_progress_bar_with_text( const char* text) { furi_check(canvas); furi_check((progress >= 0.0f) && (progress <= 1.0f)); - uint8_t height = 11; + size_t height = 11; - uint8_t progress_length = roundf(progress * (width - 2)); + float progress_width = roundf(progress * (width - 2)); canvas_set_color(canvas, ColorWhite); canvas_draw_box(canvas, x + 1, y + 1, width - 2, height - 2); canvas_set_color(canvas, ColorBlack); canvas_draw_rframe(canvas, x, y, width, height, 3); - canvas_draw_box(canvas, x + 1, y + 1, progress_length, height - 2); + canvas_draw_box(canvas, x + 1, y + 1, progress_width, height - 2); canvas_set_color(canvas, ColorXOR); canvas_set_font(canvas, FontSecondary); @@ -72,17 +72,20 @@ void elements_scrollbar_pos( int32_t x, int32_t y, size_t height, - uint16_t pos, - uint16_t total) { + size_t pos, + size_t total) { furi_check(canvas); + // prevent overflows canvas_set_color(canvas, ColorWhite); canvas_draw_box(canvas, x - 3, y, 3, height); + // dot line canvas_set_color(canvas, ColorBlack); - for(uint8_t i = y; i < height + y; i += 2) { + for(int32_t i = y; i < (int32_t)height + y; i += 2) { canvas_draw_dot(canvas, x - 2, i); } + // Position block if(total) { float block_h = ((float)height) / total; @@ -90,19 +93,22 @@ void elements_scrollbar_pos( } } -void elements_scrollbar(Canvas* canvas, uint16_t pos, uint16_t total) { +void elements_scrollbar(Canvas* canvas, size_t pos, size_t total) { furi_check(canvas); - uint8_t width = canvas_width(canvas); - uint8_t height = canvas_height(canvas); + size_t width = canvas_width(canvas); + size_t height = canvas_height(canvas); + // prevent overflows canvas_set_color(canvas, ColorWhite); canvas_draw_box(canvas, width - 3, 0, 3, height); + // dot line canvas_set_color(canvas, ColorBlack); - for(uint8_t i = 0; i < height; i += 2) { + for(size_t i = 0; i < height; i += 2) { canvas_draw_dot(canvas, width - 2, i); } + // Position block if(total) { float block_h = ((float)height) / total; @@ -127,18 +133,18 @@ void elements_frame(Canvas* canvas, int32_t x, int32_t y, size_t width, size_t h void elements_button_left(Canvas* canvas, const char* str) { furi_check(canvas); - const uint8_t button_height = 12; - const uint8_t vertical_offset = 3; - const uint8_t horizontal_offset = 3; - const uint8_t string_width = canvas_string_width(canvas, str); + const size_t button_height = 12; + const size_t vertical_offset = 3; + const size_t horizontal_offset = 3; + const size_t string_width = canvas_string_width(canvas, str); const Icon* icon = &I_ButtonLeft_4x7; - const uint8_t icon_h_offset = 3; - const uint8_t icon_width_with_offset = icon->width + icon_h_offset; - const uint8_t icon_v_offset = icon->height + vertical_offset; - const uint8_t button_width = string_width + horizontal_offset * 2 + icon_width_with_offset; + const int32_t icon_h_offset = 3; + const int32_t icon_width_with_offset = icon->width + icon_h_offset; + const int32_t icon_v_offset = icon->height + vertical_offset; + const size_t button_width = string_width + horizontal_offset * 2 + icon_width_with_offset; - const uint8_t x = 0; - const uint8_t y = canvas_height(canvas); + const int32_t x = 0; + const int32_t y = canvas_height(canvas); canvas_draw_box(canvas, x, y - button_height, button_width, button_height); canvas_draw_line(canvas, x + button_width + 0, y, x + button_width + 0, y - button_height + 0); @@ -155,18 +161,18 @@ void elements_button_left(Canvas* canvas, const char* str) { void elements_button_right(Canvas* canvas, const char* str) { furi_check(canvas); - const uint8_t button_height = 12; - const uint8_t vertical_offset = 3; - const uint8_t horizontal_offset = 3; - const uint8_t string_width = canvas_string_width(canvas, str); + const size_t button_height = 12; + const size_t vertical_offset = 3; + const size_t horizontal_offset = 3; + const size_t string_width = canvas_string_width(canvas, str); const Icon* icon = &I_ButtonRight_4x7; - const uint8_t icon_h_offset = 3; - const uint8_t icon_width_with_offset = icon->width + icon_h_offset; - const uint8_t icon_v_offset = icon->height + vertical_offset; - const uint8_t button_width = string_width + horizontal_offset * 2 + icon_width_with_offset; + const int32_t icon_h_offset = 3; + const int32_t icon_width_with_offset = icon->width + icon_h_offset; + const int32_t icon_v_offset = icon->height + vertical_offset; + const size_t button_width = string_width + horizontal_offset * 2 + icon_width_with_offset; - const uint8_t x = canvas_width(canvas); - const uint8_t y = canvas_height(canvas); + const int32_t x = canvas_width(canvas); + const int32_t y = canvas_height(canvas); canvas_draw_box(canvas, x - button_width, y - button_height, button_width, button_height); canvas_draw_line(canvas, x - button_width - 1, y, x - button_width - 1, y - button_height + 0); @@ -183,18 +189,18 @@ void elements_button_right(Canvas* canvas, const char* str) { void elements_button_center(Canvas* canvas, const char* str) { furi_check(canvas); - const uint8_t button_height = 12; - const uint8_t vertical_offset = 3; - const uint8_t horizontal_offset = 1; - const uint8_t string_width = canvas_string_width(canvas, str); + const size_t button_height = 12; + const size_t vertical_offset = 3; + const size_t horizontal_offset = 1; + const size_t string_width = canvas_string_width(canvas, str); const Icon* icon = &I_ButtonCenter_7x7; - const uint8_t icon_h_offset = 3; - const uint8_t icon_width_with_offset = icon->width + icon_h_offset; - const uint8_t icon_v_offset = icon->height + vertical_offset; - const uint8_t button_width = string_width + horizontal_offset * 2 + icon_width_with_offset; + const int32_t icon_h_offset = 3; + const int32_t icon_width_with_offset = icon->width + icon_h_offset; + const int32_t icon_v_offset = icon->height + vertical_offset; + const size_t button_width = string_width + horizontal_offset * 2 + icon_width_with_offset; - const uint8_t x = (canvas_width(canvas) - button_width) / 2; - const uint8_t y = canvas_height(canvas); + const int32_t x = (canvas_width(canvas) - button_width) / 2; + const int32_t y = canvas_height(canvas); canvas_draw_box(canvas, x, y - button_height, button_width, button_height); @@ -214,7 +220,7 @@ void elements_button_center(Canvas* canvas, const char* str) { } static size_t - elements_get_max_chars_to_fit(Canvas* canvas, Align horizontal, const char* text, uint8_t x) { + elements_get_max_chars_to_fit(Canvas* canvas, Align horizontal, const char* text, int32_t x) { const char* end = strchr(text, '\n'); if(end == NULL) { end = text + strlen(text); @@ -225,10 +231,10 @@ static size_t furi_string_left(str, text_size); size_t result = 0; - uint16_t len_px = canvas_string_width(canvas, furi_string_get_cstr(str)); - uint8_t px_left = 0; + size_t len_px = canvas_string_width(canvas, furi_string_get_cstr(str)); + size_t px_left = 0; if(horizontal == AlignCenter) { - if(x > (canvas_width(canvas) / 2)) { + if(x > (int32_t)(canvas_width(canvas) / 2)) { px_left = (canvas_width(canvas) - x) * 2; } else { px_left = x * 2; @@ -269,8 +275,8 @@ void elements_multiline_text_aligned( furi_check(canvas); furi_check(text); - uint8_t lines_count = 0; - uint8_t font_height = canvas_current_font_height(canvas); + size_t lines_count = 0; + size_t font_height = canvas_current_font_height(canvas); FuriString* line; /* go through text line by line and count lines */ @@ -293,7 +299,7 @@ void elements_multiline_text_aligned( if((start[chars_fit] == '\n') || (start[chars_fit] == 0)) { line = furi_string_alloc_printf("%.*s", chars_fit, start); - } else if((y + font_height) > (int32_t)canvas_height(canvas)) { + } else if((y + font_height) > canvas_height(canvas)) { line = furi_string_alloc_printf("%.*s...\n", chars_fit, start); } else { chars_fit -= 1; // account for the dash @@ -315,7 +321,7 @@ void elements_multiline_text(Canvas* canvas, int32_t x, int32_t y, const char* t furi_check(canvas); furi_check(text); - uint8_t font_height = canvas_current_font_height(canvas); + size_t font_height = canvas_current_font_height(canvas); FuriString* str; str = furi_string_alloc(); const char* start = text; @@ -338,25 +344,26 @@ void elements_multiline_text_framed(Canvas* canvas, int32_t x, int32_t y, const furi_check(canvas); furi_check(text); - uint8_t font_y = canvas_current_font_height(canvas); - uint16_t str_width = canvas_string_width(canvas, text); + size_t font_height = canvas_current_font_height(canvas); + size_t str_width = canvas_string_width(canvas, text); + // count \n's - uint8_t lines = 1; + size_t lines = 1; const char* t = text; while(*t != '\0') { if(*t == '\n') { lines++; - uint16_t temp_width = canvas_string_width(canvas, t + 1); + size_t temp_width = canvas_string_width(canvas, t + 1); str_width = temp_width > str_width ? temp_width : str_width; } t++; } canvas_set_color(canvas, ColorWhite); - canvas_draw_box(canvas, x, y - font_y, str_width + 8, font_y * lines + 4); + canvas_draw_box(canvas, x, y - font_height, str_width + 8, font_height * lines + 4); canvas_set_color(canvas, ColorBlack); elements_multiline_text(canvas, x + 4, y - 1, text); - elements_frame(canvas, x, y - font_y, str_width + 8, font_y * lines + 4); + elements_frame(canvas, x, y - font_height, str_width + 8, font_height * lines + 4); } void elements_slightly_rounded_frame( @@ -415,10 +422,10 @@ void elements_bold_rounded_frame(Canvas* canvas, int32_t x, int32_t y, size_t wi canvas_draw_dot(canvas, x + width - 2, y + height - 3); } -void elements_bubble(Canvas* canvas, uint8_t x, uint8_t y, uint8_t width, uint8_t height) { +void elements_bubble(Canvas* canvas, int32_t x, int32_t y, size_t width, size_t height) { furi_check(canvas); canvas_draw_rframe(canvas, x + 4, y, width, height, 3); - uint8_t y_corner = y + height * 2 / 3; + int32_t y_corner = y + height * 2 / 3; canvas_draw_line(canvas, x, y_corner, x + 4, y_corner - 4); canvas_draw_line(canvas, x, y_corner, x + 4, y_corner + 4); canvas_set_color(canvas, ColorWhite); @@ -436,37 +443,38 @@ void elements_bubble_str( furi_check(canvas); furi_check(text); - uint8_t font_y = canvas_current_font_height(canvas); - uint16_t str_width = canvas_string_width(canvas, text); + size_t font_height = canvas_current_font_height(canvas); + size_t str_width = canvas_string_width(canvas, text); + // count \n's - uint8_t lines = 1; + size_t lines = 1; const char* t = text; while(*t != '\0') { if(*t == '\n') { lines++; - uint16_t temp_width = canvas_string_width(canvas, t + 1); + size_t temp_width = canvas_string_width(canvas, t + 1); str_width = temp_width > str_width ? temp_width : str_width; } t++; } - uint8_t frame_x = x; - uint8_t frame_y = y; - uint8_t frame_width = str_width + 8; - uint8_t frame_height = font_y * lines + 4; + int32_t frame_x = x; + int32_t frame_y = y; + size_t frame_width = str_width + 8; + size_t frame_height = font_height * lines + 4; canvas_set_color(canvas, ColorWhite); canvas_draw_box(canvas, frame_x + 1, frame_y + 1, frame_width - 2, frame_height - 2); canvas_set_color(canvas, ColorBlack); canvas_draw_rframe(canvas, frame_x, frame_y, frame_width, frame_height, 1); - elements_multiline_text(canvas, x + 4, y - 1 + font_y, text); + elements_multiline_text(canvas, x + 4, y - 1 + font_height, text); - uint8_t x1 = 0; - uint8_t x2 = 0; - uint8_t x3 = 0; - uint8_t y1 = 0; - uint8_t y2 = 0; - uint8_t y3 = 0; + int32_t x1 = 0; + int32_t x2 = 0; + int32_t x3 = 0; + int32_t y1 = 0; + int32_t y2 = 0; + int32_t y3 = 0; if((horizontal == AlignLeft) && (vertical == AlignTop)) { x1 = frame_x; y1 = frame_y; @@ -560,11 +568,11 @@ void elements_bubble_str( canvas_draw_line(canvas, x2, y2, x3, y3); } -void elements_string_fit_width(Canvas* canvas, FuriString* string, uint8_t width) { +void elements_string_fit_width(Canvas* canvas, FuriString* string, size_t width) { furi_check(canvas); furi_check(string); - uint16_t len_px = canvas_string_width(canvas, furi_string_get_cstr(string)); + size_t len_px = canvas_string_width(canvas, furi_string_get_cstr(string)); if(len_px > width) { width -= canvas_string_width(canvas, "..."); do { @@ -647,18 +655,18 @@ void elements_text_box( const CanvasFontParameters* font_params = canvas_get_font_params(canvas, current_font); // Fill line parameters - uint8_t line_leading_min = font_params->leading_min; - uint8_t line_leading_default = font_params->leading_default; - uint8_t line_height = font_params->height; - uint8_t line_descender = font_params->descender; - uint8_t line_num = 0; - uint8_t line_width = 0; - uint8_t line_len = 0; - uint8_t total_height_min = 0; - uint8_t total_height_default = 0; - uint16_t i = 0; + size_t line_leading_min = font_params->leading_min; + size_t line_leading_default = font_params->leading_default; + size_t line_height = font_params->height; + size_t line_descender = font_params->descender; + size_t line_num = 0; + size_t line_width = 0; + size_t line_len = 0; + size_t total_height_min = 0; + size_t total_height_default = 0; + size_t i = 0; bool full_text_processed = false; - uint16_t dots_width = canvas_string_width(canvas, "..."); + size_t dots_width = canvas_string_width(canvas, "..."); canvas_set_font(canvas, FontSecondary); @@ -760,14 +768,14 @@ void elements_text_box( line[0].y = y + line[0].height + (height - total_height_default); } if(line_num > 1) { - for(uint8_t i = 1; i < line_num; i++) { + for(size_t i = 1; i < line_num; i++) { line[i].y = line[i - 1].y + line[i - 1].leading_default; } } } else if(line_num > 1) { - uint8_t free_pixel_num = height - total_height_min; - uint8_t fill_pixel = 0; - uint8_t j = 1; + size_t free_pixel_num = height - total_height_min; + size_t fill_pixel = 0; + size_t j = 1; line[0].y = y + line[0].height; while(fill_pixel < free_pixel_num) { line[j].y = line[j - 1].y + line[j - 1].leading_min + 1; @@ -781,8 +789,8 @@ void elements_text_box( bold = false; mono = false; inverse = false; - for(uint8_t i = 0; i < line_num; i++) { - for(uint8_t j = 0; j < line[i].len; j++) { + for(size_t i = 0; i < line_num; i++) { + for(size_t j = 0; j < line[i].len; j++) { // Process format symbols if(line[i].text[j] == ELEMENTS_BOLD_MARKER) { if(bold) { @@ -820,8 +828,9 @@ void elements_text_box( canvas_invert_color(canvas); } else { if((i == line_num - 1) && strip_to_dots) { - uint8_t next_symbol_width = canvas_glyph_width(canvas, line[i].text[j]); - if(line[i].x + next_symbol_width + dots_width > x + (int32_t)width) { + size_t next_symbol_width = canvas_glyph_width(canvas, line[i].text[j]); + if((line[i].x + (int32_t)next_symbol_width + (int32_t)dots_width) > + (x + (int32_t)width)) { canvas_draw_str(canvas, line[i].x, line[i].y, "..."); break; } diff --git a/applications/services/gui/elements.h b/applications/services/gui/elements.h index cda70dbb2..833d5d6ee 100644 --- a/applications/services/gui/elements.h +++ b/applications/services/gui/elements.h @@ -62,8 +62,8 @@ void elements_scrollbar_pos( int32_t x, int32_t y, size_t height, - uint16_t pos, - uint16_t total); + size_t pos, + size_t total); /** Draw scrollbar on canvas. * @note width 3px, height equal to canvas height @@ -72,7 +72,7 @@ void elements_scrollbar_pos( * @param pos current element of total elements * @param total total elements */ -void elements_scrollbar(Canvas* canvas, uint16_t pos, uint16_t total); +void elements_scrollbar(Canvas* canvas, size_t pos, size_t total); /** Draw rounded frame * @@ -176,7 +176,7 @@ void elements_bold_rounded_frame(Canvas* canvas, int32_t x, int32_t y, size_t wi * @param width bubble width * @param height bubble height */ -void elements_bubble(Canvas* canvas, uint8_t x, uint8_t y, uint8_t width, uint8_t height); +void elements_bubble(Canvas* canvas, int32_t x, int32_t y, size_t width, size_t height); /** Draw bubble frame for text with corner * @@ -201,7 +201,7 @@ void elements_bubble_str( * @param string string to trim * @param width max width */ -void elements_string_fit_width(Canvas* canvas, FuriString* string, uint8_t width); +void elements_string_fit_width(Canvas* canvas, FuriString* string, size_t width); /** Draw scrollable text line * diff --git a/targets/f18/api_symbols.csv b/targets/f18/api_symbols.csv index da579d730..7680c200b 100644 --- a/targets/f18/api_symbols.csv +++ b/targets/f18/api_symbols.csv @@ -853,7 +853,7 @@ Function,-,drand48,double, Function,-,drem,double,"double, double" Function,-,dremf,float,"float, float" Function,+,elements_bold_rounded_frame,void,"Canvas*, int32_t, int32_t, size_t, size_t" -Function,+,elements_bubble,void,"Canvas*, uint8_t, uint8_t, uint8_t, uint8_t" +Function,+,elements_bubble,void,"Canvas*, int32_t, int32_t, size_t, size_t" Function,+,elements_bubble_str,void,"Canvas*, int32_t, int32_t, const char*, Align, Align" Function,+,elements_button_center,void,"Canvas*, const char*" Function,+,elements_button_left,void,"Canvas*, const char*" @@ -865,11 +865,11 @@ Function,+,elements_multiline_text_framed,void,"Canvas*, int32_t, int32_t, const Function,+,elements_progress_bar,void,"Canvas*, int32_t, int32_t, size_t, float" Function,+,elements_progress_bar_with_text,void,"Canvas*, int32_t, int32_t, size_t, float, const char*" Function,+,elements_scrollable_text_line,void,"Canvas*, int32_t, int32_t, size_t, FuriString*, size_t, _Bool" -Function,+,elements_scrollbar,void,"Canvas*, uint16_t, uint16_t" -Function,+,elements_scrollbar_pos,void,"Canvas*, int32_t, int32_t, size_t, uint16_t, uint16_t" +Function,+,elements_scrollbar,void,"Canvas*, size_t, size_t" +Function,+,elements_scrollbar_pos,void,"Canvas*, int32_t, int32_t, size_t, size_t, size_t" Function,+,elements_slightly_rounded_box,void,"Canvas*, int32_t, int32_t, size_t, size_t" Function,+,elements_slightly_rounded_frame,void,"Canvas*, int32_t, int32_t, size_t, size_t" -Function,+,elements_string_fit_width,void,"Canvas*, FuriString*, uint8_t" +Function,+,elements_string_fit_width,void,"Canvas*, FuriString*, size_t" Function,+,elements_text_box,void,"Canvas*, int32_t, int32_t, size_t, size_t, Align, Align, const char*, _Bool" Function,+,elf_resolve_from_hashtable,_Bool,"const ElfApiInterface*, uint32_t, Elf32_Addr*" Function,+,elf_symbolname_hash,uint32_t,const char* diff --git a/targets/f7/api_symbols.csv b/targets/f7/api_symbols.csv index 8270cd9be..ae8fefc0a 100644 --- a/targets/f7/api_symbols.csv +++ b/targets/f7/api_symbols.csv @@ -921,7 +921,7 @@ Function,-,drand48,double, Function,-,drem,double,"double, double" Function,-,dremf,float,"float, float" Function,+,elements_bold_rounded_frame,void,"Canvas*, int32_t, int32_t, size_t, size_t" -Function,+,elements_bubble,void,"Canvas*, uint8_t, uint8_t, uint8_t, uint8_t" +Function,+,elements_bubble,void,"Canvas*, int32_t, int32_t, size_t, size_t" Function,+,elements_bubble_str,void,"Canvas*, int32_t, int32_t, const char*, Align, Align" Function,+,elements_button_center,void,"Canvas*, const char*" Function,+,elements_button_left,void,"Canvas*, const char*" @@ -933,11 +933,11 @@ Function,+,elements_multiline_text_framed,void,"Canvas*, int32_t, int32_t, const Function,+,elements_progress_bar,void,"Canvas*, int32_t, int32_t, size_t, float" Function,+,elements_progress_bar_with_text,void,"Canvas*, int32_t, int32_t, size_t, float, const char*" Function,+,elements_scrollable_text_line,void,"Canvas*, int32_t, int32_t, size_t, FuriString*, size_t, _Bool" -Function,+,elements_scrollbar,void,"Canvas*, uint16_t, uint16_t" -Function,+,elements_scrollbar_pos,void,"Canvas*, int32_t, int32_t, size_t, uint16_t, uint16_t" +Function,+,elements_scrollbar,void,"Canvas*, size_t, size_t" +Function,+,elements_scrollbar_pos,void,"Canvas*, int32_t, int32_t, size_t, size_t, size_t" Function,+,elements_slightly_rounded_box,void,"Canvas*, int32_t, int32_t, size_t, size_t" Function,+,elements_slightly_rounded_frame,void,"Canvas*, int32_t, int32_t, size_t, size_t" -Function,+,elements_string_fit_width,void,"Canvas*, FuriString*, uint8_t" +Function,+,elements_string_fit_width,void,"Canvas*, FuriString*, size_t" Function,+,elements_text_box,void,"Canvas*, int32_t, int32_t, size_t, size_t, Align, Align, const char*, _Bool" Function,+,elf_resolve_from_hashtable,_Bool,"const ElfApiInterface*, uint32_t, Elf32_Addr*" Function,+,elf_symbolname_hash,uint32_t,const char*