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

Main Menu: Refine CoverFlow menu style (#379)

Browse Source 
* Main Menu: Refine CoverFlow menu style

- Rounds the corners of the cards
- Adds 1px margin around the center card
- Fixes vertical spacing of the cards, text label and the scrollbar.

* Update changelog

---------

Co-authored-by: Willy-JL <49810075+Willy-JL@users.noreply.github.com>
This commit is contained in:
Alexander Bays
2025-03-01 22:04:19 -06:00
committed by GitHub
parent 4ce6b4e1c5
commit 3b96cc47a7
2 changed files with 26 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@@ -60,6 +60,7 @@
- BadKB: Rewritten BadKB extras on top of "new" OFW BadUSB structure (by @Willy-JL)
- Additionally, can now customize MAC address when BLE Remember is enabled
- Also added `BLE_ID` command, same as `BT_ID`
- Main Menu: Refined CoverFlow menu style (#379 by @956MB)
- NFC:
- OFW: Added naming for DESFire cards + fix MF3ICD40 cards unable to be read (by @Demae)
- OFW: FeliCa Protocol Expose Read Block API and Allow Specifying Service (by @zinongli)

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

@@ -464,36 +464,36 @@ static void menu_draw_callback(Canvas* canvas, void* _model) {
// Draw frames
canvas_set_bitmap_mode(canvas, true);
canvas_draw_frame(canvas, 0, 0, 128, 64);
canvas_draw_frame(canvas, 44, 2, 40, 40);
canvas_draw_rframe(canvas, 45, 4, 38, 38, 3);
// Draw left side albums
canvas_draw_line(canvas, 6, 40, 17, 35);
canvas_draw_line(canvas, 19, 40, 30, 35);
canvas_draw_line(canvas, 32, 40, 43, 35);
canvas_draw_line(canvas, 6, 3, 17, 8);
canvas_draw_line(canvas, 19, 3, 30, 8);
canvas_draw_line(canvas, 32, 3, 43, 8);
canvas_draw_line(canvas, 18, 2, 18, 41);
canvas_draw_line(canvas, 31, 2, 31, 41);
canvas_draw_line(canvas, 5, 2, 5, 41);
canvas_draw_line(canvas, 4, 8, 1, 7);
canvas_draw_line(canvas, 5, 35, 1, 36);
canvas_draw_line(canvas, 5, 36, 1, 37);
canvas_draw_line(canvas, 4, 9, 1, 8);
canvas_draw_line(canvas, 6, 41, 17, 36);
canvas_draw_line(canvas, 19, 41, 30, 36);
canvas_draw_line(canvas, 32, 41, 43, 36);
canvas_draw_line(canvas, 6, 4, 17, 9);
canvas_draw_line(canvas, 19, 4, 30, 9);
canvas_draw_line(canvas, 32, 4, 43, 9);
canvas_draw_line(canvas, 5, 5, 5, 40);
canvas_draw_line(canvas, 18, 5, 18, 40);
canvas_draw_line(canvas, 31, 5, 31, 40);
// Draw right side albums
canvas_draw_line(canvas, 95, 40, 84, 35);
canvas_draw_line(canvas, 108, 40, 97, 35);
canvas_draw_line(canvas, 121, 40, 110, 35);
canvas_draw_line(canvas, 84, 8, 95, 3);
canvas_draw_line(canvas, 97, 8, 108, 3);
canvas_draw_line(canvas, 110, 8, 121, 3);
canvas_draw_line(canvas, 96, 2, 96, 41);
canvas_draw_line(canvas, 109, 2, 109, 41);
canvas_draw_line(canvas, 122, 2, 122, 41);
canvas_draw_line(canvas, 123, 8, 126, 7);
canvas_draw_line(canvas, 123, 35, 126, 36);
canvas_draw_line(canvas, 95, 41, 84, 36);
canvas_draw_line(canvas, 108, 41, 97, 36);
canvas_draw_line(canvas, 121, 41, 110, 36);
canvas_draw_line(canvas, 84, 9, 95, 4);
canvas_draw_line(canvas, 97, 9, 108, 4);
canvas_draw_line(canvas, 110, 9, 121, 4);
canvas_draw_line(canvas, 96, 5, 96, 40);
canvas_draw_line(canvas, 109, 5, 109, 40);
canvas_draw_line(canvas, 122, 5, 122, 40);
canvas_draw_line(canvas, 123, 9, 126, 8);
canvas_draw_line(canvas, 123, 36, 126, 37);
const int32_t pos_x_center = 128 / 2;
const int32_t pos_y_center = 64 / 2;
const int32_t pos_y_center = (64 / 2) + 1;
const int32_t pos_y_offset = 10;
const int32_t icon_size = 20;
const int32_t side_icon_width = icon_size / 2;
@@ -552,7 +552,7 @@ static void menu_draw_callback(Canvas* canvas, void* _model) {
elements_scrollable_text_line_centered(
canvas,
pos_x_center,
(pos_y_center + icon_size / 2) + pos_y_offset,
(pos_y_center + icon_size / 2) + pos_y_offset + 1,
124,
name,
scroll_counter,