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

Compact++

Browse Source
This commit is contained in:
Willy-JL
2023-09-10 00:59:13 +02:00
parent 19a8eeee69
commit a7a5503e27
1 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
applications/services/gui/modules/menu.c
View File

@@ -359,25 +359,25 @@ static void menu_draw_callback(Canvas* canvas, void* _model) {
size_t index; size_t index;
size_t y_off, x_off; size_t y_off, x_off;
canvas_set_font(canvas, FontKeyboard); canvas_set_font(canvas, FontBatteryPercent);
for(size_t i = 0; i < 2; i++) { for(size_t i = 0; i < 2; i++) {
for(size_t j = 0; j < 7; j++) { for(size_t j = 0; j < 8; j++) {
index = i * 7 + j + (position - (position % 14)); index = i * 8 + j + (position - (position % 16));
if(index >= items_count) continue; if(index >= items_count) continue;
y_off = (9 * j) - 4; y_off = (8 * j);
x_off = 64 * i; x_off = 64 * i;
bool selected = index == position; bool selected = index == position;
size_t scroll_counter = menu_scroll_counter(model, selected); size_t scroll_counter = menu_scroll_counter(model, selected);
if(selected) { if(selected) {
canvas_draw_box(canvas, x_off, y_off + 4, 64, 9); canvas_draw_box(canvas, x_off, y_off, 64, 8);
canvas_set_color(canvas, ColorWhite); canvas_set_color(canvas, ColorWhite);
} }
item = MenuItemArray_get(model->items, index); item = MenuItemArray_get(model->items, index);
menu_short_name(item, name); menu_short_name(item, name);
elements_scrollable_text_line( elements_scrollable_text_line(
canvas, x_off + 2, y_off + 12, 64, name, scroll_counter, false); canvas, x_off + 1, y_off + 7, 62, name, scroll_counter, false);
if(selected) { if(selected) {
canvas_set_color(canvas, ColorBlack); canvas_set_color(canvas, ColorBlack);
@@ -744,10 +744,10 @@ static void menu_process_left(Menu* menu) {
vertical_offset = CLAMP(MAX((int)position - 4, 0), MAX((int)count - 8, 0), 0); vertical_offset = CLAMP(MAX((int)position - 4, 0), MAX((int)count - 8, 0), 0);
break; break;
case MenuStyleCompact: case MenuStyleCompact:
if((position % 14) < 7) { if((position % 16) < 8) {
position = position + 7; position = position + 8;
} else { } else {
position = position - 7; position = position - 8;
} }
vertical_offset = CLAMP(MAX((int)position - 4, 0), MAX((int)count - 8, 0), 0); vertical_offset = CLAMP(MAX((int)position - 4, 0), MAX((int)count - 8, 0), 0);
break; break;
@@ -811,10 +811,10 @@ static void menu_process_right(Menu* menu) {
vertical_offset = CLAMP(MAX((int)position - 4, 0), MAX((int)count - 8, 0), 0); vertical_offset = CLAMP(MAX((int)position - 4, 0), MAX((int)count - 8, 0), 0);
break; break;
case MenuStyleCompact: case MenuStyleCompact:
if((position % 14) < 7) { if((position % 16) < 8) {
position = position + 7; position = position + 8;
} else { } else {
position = position - 7; position = position - 8;
} }
vertical_offset = CLAMP(MAX((int)position - 4, 0), MAX((int)count - 8, 0), 0); vertical_offset = CLAMP(MAX((int)position - 4, 0), MAX((int)count - 8, 0), 0);
break; break;