From 702129592c430bee01190cc29e4dead039d4505e Mon Sep 17 00:00:00 2001 From: anod <182859762@qq.com> Date: Fri, 5 Aug 2022 18:45:42 +0800 Subject: [PATCH] for pull --- source/arm11/acf.c | 4 ++-- source/arm11/filebrowser.c | 1 + source/arm11/main.c | 2 -- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/source/arm11/acf.c b/source/arm11/acf.c index c9ac93b..a1a710d 100644 --- a/source/arm11/acf.c +++ b/source/arm11/acf.c @@ -21,7 +21,7 @@ typedef struct uint16_t amount; char *filename; uint16_t *chapter; - uint32 filesize; + uint32_t filesize; } ACFont; static ACFont gblfont = { @@ -351,7 +351,7 @@ const char *acf_draw(int x, int y, unsigned width, unsigned height, unsigned max } uint32_t unicode; - unsigned *option = width == 0 ? NULL : &width; + unsigned *option = width == 0 ? NULL : &maxwidth; for (const char *next = next_unicode(utf8_line, &unicode); next != NULL; next = next_unicode(utf8_line, &unicode)) diff --git a/source/arm11/filebrowser.c b/source/arm11/filebrowser.c index d931280..af1aa92 100644 --- a/source/arm11/filebrowser.c +++ b/source/arm11/filebrowser.c @@ -85,6 +85,7 @@ static Result scanDir(const char *const path, DirList *const dList, const char * u32 read; // Number of entries read by fReadDir(). u32 numEntries = 0; // Total number of processed entries. u32 entBufPos = 0; // Entry buffer position/number of bytes used. + acf_set_font("wqy11.acf"); const u32 filterLen = strlen(filter); do { diff --git a/source/arm11/main.c b/source/arm11/main.c index f800126..82bf4c4 100644 --- a/source/arm11/main.c +++ b/source/arm11/main.c @@ -25,8 +25,6 @@ #include "arm11/drivers/hid.h" #include "arm11/power.h" - - static void setBacklight(void) { u8 backlightMax;