Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2026-06-08 01:42:58 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Add two new small, bold, sans-serif fonts

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@4130 42af7a65-404d-4744-a932-0658087f49c3
This commit is contained in:
patacongo
2011-12-01 15:15:35 +00:00
parent 75ee14b862
commit 0fd408ca95
14 changed files with 3574 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/nuttx/nx/nxfonts.h
+36 -9
View File
@@ -54,11 +54,17 @@
* is likely down the road.
*/
/* SANS */
/* Sans serif fonts */
#if defined(CONFIG_NXFONT_SANS23X27) /* The "legacy," tiny NuttX font */
# define NXFONT_DEFAULT FONTID_SANS23X27
#elif defined(CONFIG_NXFONT_SANS17X22)
# define NXFONT_DEFAULT FONTID_SANS17X22
#elif defined(CONFIG_NXFONT_SANS20X26)
# define NXFONT_DEFAULT FONTID_SANS20X26
#elif defined(CONFIG_NXFONT_SANS22X29)
# define NXFONT_DEFAULT FONTID_SANS22X29
@@ -68,7 +74,13 @@
#elif defined(CONFIG_NXFONT_SANS39X48)
# define NXFONT_DEFAULT FONTID_SANS39X48
/* SANS-BOLD */
/* Sans serif bold fonts */
#elif defined(CONFIG_NXFONT_SANS17X23B)
# define NXFONT_DEFAULT FONTID_SANS17X23B
#elif defined(CONFIG_NXFONT_SANS20X27B)
# define NXFONT_DEFAULT FONTID_SANS20X27B
#elif defined(CONFIG_NXFONT_SANS22X29B)
# define NXFONT_DEFAULT FONTID_SANS22X29B
@@ -79,7 +91,7 @@
#elif defined(CONFIG_NXFONT_SANS40X49B)
# define NXFONT_DEFAULT FONTID_SANS40X49B
/* SERIF */
/* Serif fonts */
#elif defined(CONFIG_NXFONT_SERIF22X29)
# define NXFONT_DEFAULT FONTID_SERIF22X29
@@ -90,12 +102,11 @@
#elif defined(CONFIG_NXFONT_SERIF38X48)
# define NXFONT_DEFAULT FONTID_SERIF38X48
/* SERIF-BOLD */
/* Serif bold fonts */
#elif defined(CONFIG_NXFONT_SERIF22X28B)
# define NXFONT_DEFAULT FONTID_SERIF22X28B
#elif defined(CONFIG_NXFONT_SERIF27X38B)
# define NXFONT_DEFAULT FONTID_SERIF27X38B
@@ -114,7 +125,15 @@ enum nx_fontid_e
{
FONTID_DEFAULT = 0 /* The default font */
/* SANS */
/* Sans Serif fonts */
#ifdef CONFIG_NXFONT_SANS17X22
, FONTID_SANS17X22 = 14 /* The 17x22 sans serif font */
#endif
#ifdef CONFIG_NXFONT_SANS20X26
, FONTID_SANS20X26 = 15 /* The 20x26 sans serif font */
#endif
#ifdef CONFIG_NXFONT_SANS23X27
, FONTID_SANS23X27 = 1 /* The 23x27 sans serif font */
@@ -132,7 +151,15 @@ enum nx_fontid_e
, FONTID_SANS39X48 = 4 /* The 39x48 sans serif font */
#endif
/* SANS-BOLD */
/* Sans Serif bold fonts */
#ifdef CONFIG_NXFONT_SANS17X23B
, FONTID_SANS17X23B = 16 /* The 17x23 sans bold font */
#endif
#ifdef CONFIG_NXFONT_SANS20X27B
, FONTID_SANS20X27B = 17 /* The 20x27 sans bold font */
#endif
#ifdef CONFIG_NXFONT_SANS22X29B
, FONTID_SANS22X29B = 5 /* The 22x29 sans bold font */
@@ -146,7 +173,7 @@ enum nx_fontid_e
, FONTID_SANS40X49B = 7 /* The 40x49 sans bold font */
#endif
/* SERIF */
/* Serif fonts */
#ifdef CONFIG_NXFONT_SERIF22X29
, FONTID_SERIF22X29 = 8 /* The 22x29 serif font */
@@ -160,7 +187,7 @@ enum nx_fontid_e
, FONTID_SERIF38X48 = 10 /* The 38x48 serif font */
#endif
/* SERIF-BOLD */
/* Serif bold fonts */
#ifdef CONFIG_NXFONT_SERIF22X28B
, FONTID_SERIF22X28B = 11 /* The 22x28 serif bold font */