mount/flipperzero-firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix display last symbol in multiline text (#2967)

Browse Source 
* Revert submodules
* Compare without round
* Gui: slightly more integer logic in elements_get_max_chars_to_fit

Co-authored-by: hedger <hedger@users.noreply.github.com>
Co-authored-by: あく <alleteam@gmail.com>
This commit is contained in:
Dzhos Oleksii 2023-08-22 22:15:38 +03:00 committed by GitHub
parent 27b2808ade
commit dc7517e5fd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
applications/services/gui/elements.c
View File

@ -236,11 +236,11 @@ static size_t
} }
if(len_px > px_left) { if(len_px > px_left) {
uint8_t excess_symbols_approximately = size_t excess_symbols_approximately =
roundf((float)(len_px - px_left) / ((float)len_px / (float)text_size)); ceilf((float)(len_px - px_left) / ((float)len_px / (float)text_size));
// reduce to 5 to be sure dash fit, and next line will be at least 5 symbols long // reduce to 5 to be sure dash fit, and next line will be at least 5 symbols long
if(excess_symbols_approximately > 0) { if(excess_symbols_approximately > 0) {
excess_symbols_approximately = MAX(excess_symbols_approximately, 5); excess_symbols_approximately = MAX(excess_symbols_approximately, 5u);
result = text_size - excess_symbols_approximately - 1; result = text_size - excess_symbols_approximately - 1;
} else { } else {
result = text_size; result = text_size;