Mirror/Momentum-Firmware
1
0
Fork 0
mirror of https://github.com/Next-Flip/Momentum-Firmware.git synced 2026-04-24 03:29:57 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'ofw_dev' into dev

Browse Source
This commit is contained in:
MX
2023-10-15 01:30:55 +03:00
parent 130fa43ad6 e664159188
commit b87a8ca329
19 changed files with 105 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

90
applications/services/gui/modules/byte_input.c
View File

@@ -226,16 +226,33 @@ static void byte_input_draw_input(Canvas* canvas, ByteInputModel* model) {
canvas_invert_color(canvas);
}
} else {
canvas_draw_glyph(
canvas,
text_x + 2 + byte_position * 14,
text_y,
byte_input_get_nibble_text(model->bytes[i], true));
canvas_draw_glyph(
canvas,
text_x + 8 + byte_position * 14,
text_y,
byte_input_get_nibble_text(model->bytes[i], false));
if(model->first_visible_byte > 0 && i == model->first_visible_byte) {
canvas_draw_icon(
canvas,
text_x + 2 + byte_position * 14,
text_y - 7,
&I_More_data_placeholder_5x7);
} else {
canvas_draw_glyph(
canvas,
text_x + 2 + byte_position * 14,
text_y,
byte_input_get_nibble_text(model->bytes[i], true));
}
if(model->bytes_count - model->first_visible_byte > max_drawable_bytes &&
i == model->first_visible_byte + MIN(model->bytes_count, max_drawable_bytes) - 1) {
canvas_draw_icon(
canvas,
text_x + 8 + byte_position * 14,
text_y - 7,
&I_More_data_placeholder_5x7);
} else {
canvas_draw_glyph(
canvas,
text_x + 8 + byte_position * 14,
text_y,
byte_input_get_nibble_text(model->bytes[i], false));
}
}
if(draw_index_line) {
@@ -260,14 +277,6 @@ static void byte_input_draw_input(Canvas* canvas, ByteInputModel* model) {
snprintf(str, 20, "%u", (model->selected_byte + 1));
canvas_draw_str(canvas, text_x + 75, text_y2, str);
}
if(model->bytes_count - model->first_visible_byte > max_drawable_bytes) {
canvas_draw_icon(canvas, 123, 21, &I_ButtonRightSmall_3x5);
}
if(model->first_visible_byte > 0) {
canvas_draw_icon(canvas, 1, 21, &I_ButtonLeftSmall_3x5);
}
}
/** Draw input box (selected view)
@@ -306,27 +315,36 @@ static void byte_input_draw_input_selected(Canvas* canvas, ByteInputModel* model
byte_input_get_nibble_text(model->bytes[i], false));
canvas_invert_color(canvas);
} else {
canvas_draw_glyph(
canvas,
text_x + 2 + byte_position * 14,
text_y,
byte_input_get_nibble_text(model->bytes[i], true));
canvas_draw_glyph(
canvas,
text_x + 8 + byte_position * 14,
text_y,
byte_input_get_nibble_text(model->bytes[i], false));
if(model->first_visible_byte > 0 && i == model->first_visible_byte) {
canvas_draw_icon(
canvas,
text_x + 2 + byte_position * 14,
text_y - 7,
&I_More_data_placeholder_5x7);
} else {
canvas_draw_glyph(
canvas,
text_x + 2 + byte_position * 14,
text_y,
byte_input_get_nibble_text(model->bytes[i], true));
}
if(model->bytes_count - model->first_visible_byte > max_drawable_bytes &&
i == model->first_visible_byte + MIN(model->bytes_count, max_drawable_bytes) - 1) {
canvas_draw_icon(
canvas,
text_x + 8 + byte_position * 14,
text_y - 7,
&I_More_data_placeholder_5x7);
} else {
canvas_draw_glyph(
canvas,
text_x + 8 + byte_position * 14,
text_y,
byte_input_get_nibble_text(model->bytes[i], false));
}
}
}
if(model->bytes_count - model->first_visible_byte > max_drawable_bytes) {
canvas_draw_icon(canvas, 123, 21, &I_ButtonRightSmall_3x5);
}
if(model->first_visible_byte > 0) {
canvas_draw_icon(canvas, 1, 21, &I_ButtonLeftSmall_3x5);
}
canvas_invert_color(canvas);
}