summaryrefslogtreecommitdiff
path: root/firmware/export/font.h
diff options
context:
space:
mode:
authorJonathan Gordon <rockbox@jdgordon.info>2011-11-08 10:09:33 +0000
committerJonathan Gordon <rockbox@jdgordon.info>2011-11-08 10:09:33 +0000
commitf19f3efb078b2947638f6f7a7f209de44daf78b3 (patch)
tree46ddfc7234b2de6e848d5bcd7630821d91a84f37 /firmware/export/font.h
parent452a3ce2742949e184d6bc9c9b1f7985dae3e874 (diff)
downloadrockbox-f19f3efb078b2947638f6f7a7f209de44daf78b3.tar.gz
rockbox-f19f3efb078b2947638f6f7a7f209de44daf78b3.zip
Redo r30826 (and hopefully not reintroduce font issues) which cleans up the font API. FONT_UI is deprecated, use screens[screen].getuifont() instead (and .setuifont() to set it after a font has been loaded)
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@30932 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware/export/font.h')
-rw-r--r--firmware/export/font.h5
1 files changed, 1 insertions, 4 deletions
diff --git a/firmware/export/font.h b/firmware/export/font.h
index 76f86c845f..914d3aa2ff 100644
--- a/firmware/export/font.h
+++ b/firmware/export/font.h
@@ -55,7 +55,7 @@ enum {
55 55
56/* SYSFONT, FONT_UI, FONT_UI_REMOTE + MAXUSERFONTS fonts in skins */ 56/* SYSFONT, FONT_UI, FONT_UI_REMOTE + MAXUSERFONTS fonts in skins */
57#define MAXFONTS (FONT_FIRSTUSERFONT + MAXUSERFONTS) 57#define MAXFONTS (FONT_FIRSTUSERFONT + MAXUSERFONTS)
58#define FONT_UI MAXUSERFONTS 58#define FONT_UI MAXFONTS
59 59
60/* 60/*
61 * .fnt loadable font file format definition 61 * .fnt loadable font file format definition
@@ -124,9 +124,6 @@ int font_glyphs_to_bufsize(const char *path, int glyphs);
124void font_unload(int font_id); 124void font_unload(int font_id);
125void font_unload_all(void); 125void font_unload_all(void);
126void font_lock(int font_id, bool lock); 126void font_lock(int font_id, bool lock);
127/* set the default UI font */
128void font_set_ui(int font_id);
129int font_get_ui(void);
130 127
131struct font* font_get(int font); 128struct font* font_get(int font);
132 129