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

[FL-1110] Status bar height fix (#403)

Browse Source 
* fix statusbar height and main screen views, added multiline text framed func
* replace char* arguments with const char*
* small prettify
* move pointer increment to end of loop
This commit is contained in:
its your bedtime
2021-04-06 20:09:15 +03:00
committed by GitHub
parent 33a461e97b
commit 5cd73ac97b
4 changed files with 67 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
applications/gui/elements.c
View File

@@ -171,14 +171,14 @@ void elements_multiline_text_aligned(
string_clear(str);
}
void elements_multiline_text(Canvas* canvas, uint8_t x, uint8_t y, char* text) {
void elements_multiline_text(Canvas* canvas, uint8_t x, uint8_t y, const char* text) {
furi_assert(canvas);
furi_assert(text);
uint8_t font_height = canvas_current_font_height(canvas);
string_t str;
string_init(str);
char* start = text;
const char* start = text;
char* end;
do {
end = strchr(start, '\n');
@@ -194,6 +194,31 @@ void elements_multiline_text(Canvas* canvas, uint8_t x, uint8_t y, char* text) {
string_clear(str);
}
void elements_multiline_text_framed(Canvas* canvas, uint8_t x, uint8_t y, const char* text) {
furi_assert(canvas);
furi_assert(text);
uint8_t font_y = canvas_current_font_height(canvas);
uint16_t str_width = canvas_string_width(canvas, text);
// count \n's
uint8_t lines = 1;
const char* t = text;
while(*t != '\0') {
if(*t == '\n') {
lines++;
uint16_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 + 6);
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 + 6);
}
void elements_slightly_rounded_frame(
Canvas* canvas,
uint8_t x,