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

Fix font descent parsing and re-enable icons in debug

Browse Source
This commit is contained in:
Willy-JL
2024-02-09 19:32:59 +00:00
parent 7248203ba0
commit 5181f4878d
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/xtreme/assets.c
+6 -2
View File
@@ -10,6 +10,9 @@
#define ICONS_FMT XTREME_ASSETS_PATH "/%s/Icons/%s"
#define FONTS_FMT XTREME_ASSETS_PATH "/%s/Fonts/%s.u8f"
// See lib/u8g2/u8g2_font.c
#define U8G2_FONT_DATA_STRUCT_SIZE 23
XtremeAssets xtreme_assets = {
.is_nsfw = false,
.fonts = {NULL},
@@ -114,13 +117,14 @@ void load_font(FontSwap font, const char* name, FuriString* path, File* file) {
uint64_t size = storage_file_size(file);
uint8_t* swap = malloc(size);
if(size > 20 && storage_file_read(file, swap, size) == size) {
if(size > U8G2_FONT_DATA_STRUCT_SIZE && storage_file_read(file, swap, size) == size) {
xtreme_assets.fonts[font] = swap;
CanvasFontParameters* params = malloc(sizeof(CanvasFontParameters));
// See lib/u8g2/u8g2_font.c
params->leading_default = swap[10]; // max_char_height
params->leading_min = params->leading_default - 2; // good enough
params->height = swap[13]; // ascent_A
params->descender = swap[19]; // start_pos_lower_a
params->descender = swap[14]; // descent_g
xtreme_assets.font_params[font] = params;
} else {
free(swap);
scripts/assets.py
+1 -1
View File
@@ -223,7 +223,7 @@ class Main(App):
icons_c.write(
"""
const IconPath ICON_PATHS[] = {
#if !defined(FURI_RAM_EXEC) && !defined(FURI_DEBUG)
#ifndef FURI_RAM_EXEC
"""
)
for name, path in paths: