diff --git a/applications/services/gui/elements.c b/applications/services/gui/elements.c index 785f4cbb3..8f350cae6 100644 --- a/applications/services/gui/elements.c +++ b/applications/services/gui/elements.c @@ -532,6 +532,20 @@ void elements_bubble_str( canvas_draw_line(canvas, x2, y2, x3, y3); } +void elements_string_fit_width(Canvas* canvas, FuriString* string, uint8_t width) { + furi_assert(canvas); + furi_assert(string); + + uint16_t len_px = canvas_string_width(canvas, furi_string_get_cstr(string)); + if(len_px > width) { + width -= canvas_string_width(canvas, "..."); + do { + furi_string_left(string, furi_string_size(string) - 1); + len_px = canvas_string_width(canvas, furi_string_get_cstr(string)); + } while(len_px > width); + furi_string_cat(string, "..."); + } +} void elements_string_fit_width_trunc(Canvas* canvas, FuriString* string, uint8_t width) { furi_assert(canvas); @@ -546,7 +560,6 @@ void elements_string_fit_width_trunc(Canvas* canvas, FuriString* string, uint8_t } } - void elements_text_box( Canvas* canvas, uint8_t x, @@ -754,4 +767,4 @@ void elements_text_box( } } canvas_set_font(canvas, FontSecondary); -} +} \ No newline at end of file diff --git a/fbt_options.py b/fbt_options.py index 4c3b39c62..2a7cf6531 100644 --- a/fbt_options.py +++ b/fbt_options.py @@ -14,7 +14,7 @@ DEBUG = 0 # Suffix to add to files when building distribution # If OS environment has DIST_SUFFIX set, it will be used instead -DIST_SUFFIX = "CC_CL-0012" +DIST_SUFFIX = "CC_CL-0013" # Coprocessor firmware COPRO_OB_DATA = "scripts/ob.data"