Mirror/Momentum-Firmware
1
0
Fork 0
mirror of https://github.com/Next-Flip/Momentum-Firmware.git synced 2026-05-13 23:28:36 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'gui-elements-fix' of https://github.com/Willy-JL/flipperzero-firmware into mntm-dev

Browse Source
This commit is contained in:
Willy-JL
2024-03-22 20:57:41 +00:00
parent c7d18804da 2e9855972e
commit fe80cb08e1
4 changed files with 144 additions and 135 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -17,29 +17,29 @@
#include <stdbool.h>
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;
@@ -95,15 +98,15 @@ void elements_scrollbar_horizontal(
int32_t x,
int32_t y,
size_t width,
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, y - 3, width, 3);
// dot line
canvas_set_color(canvas, ColorBlack);
for(uint8_t i = x; i < width + x; i += 2) {
for(size_t i = x; i < width + x; i += 2) {
canvas_draw_dot(canvas, i, y - 2);
}
// Position block
@@ -113,19 +116,22 @@ void elements_scrollbar_horizontal(
}
}
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;
@@ -150,18 +156,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);
@@ -178,18 +184,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);
@@ -206,18 +212,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);
@@ -237,7 +243,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);
@@ -248,10 +254,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;
@@ -292,8 +298,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 */
@@ -316,7 +322,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
@@ -338,7 +344,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;
@@ -361,25 +367,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(
@@ -438,10 +445,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);
@@ -459,37 +466,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;
@@ -583,11 +591,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 {
@@ -706,18 +714,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);
@@ -819,14 +827,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;
@@ -840,8 +848,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) {
@@ -879,8 +887,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;
}

14
applications/services/gui/elements.h
View File

@@ -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 horizontal scrollbar on canvas at specific position.
*
@@ -79,8 +79,8 @@ void elements_scrollbar_horizontal(
int32_t x,
int32_t y,
size_t width,
uint16_t pos,
uint16_t total);
size_t pos,
size_t total);
/** Draw scrollbar on canvas.
* @note width 3px, height equal to canvas height
@@ -89,7 +89,7 @@ void elements_scrollbar_horizontal(
* @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
*
@@ -193,7 +193,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
*
@@ -218,7 +218,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
*