diff options
| author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2011-07-19 20:08:28 +0000 |
|---|---|---|
| committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2011-07-19 20:08:28 +0000 |
| commit | e22652b8670c85c11bed70615d97273d455d58a9 (patch) | |
| tree | afb799c4411fe56a1af05c4e25d5f44453691cbe /apps/examples/nxtext | |
| parent | 40e9e372738c38180562ab1ff3b1f91d42c14cdd (diff) | |
| download | px4-nuttx-e22652b8670c85c11bed70615d97273d455d58a9.tar.gz px4-nuttx-e22652b8670c85c11bed70615d97273d455d58a9.tar.bz2 px4-nuttx-e22652b8670c85c11bed70615d97273d455d58a9.zip | |
Setup environment to support multiple fonts
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@3799 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'apps/examples/nxtext')
| -rw-r--r-- | apps/examples/nxtext/nxtext_bkgd.c | 2 | ||||
| -rw-r--r-- | apps/examples/nxtext/nxtext_popup.c | 2 | ||||
| -rw-r--r-- | apps/examples/nxtext/nxtext_putc.c | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/apps/examples/nxtext/nxtext_bkgd.c b/apps/examples/nxtext/nxtext_bkgd.c index d94f19dc1..e711c84bb 100644 --- a/apps/examples/nxtext/nxtext_bkgd.c +++ b/apps/examples/nxtext/nxtext_bkgd.c @@ -402,7 +402,7 @@ FAR struct nxtext_state_s *nxbg_getstate(void) * state structure */ - fontset = nxf_getfontset(); + fontset = nxf_getfontset(NXFONT_DEFAULT); g_bgstate.fheight = fontset->mxheight; g_bgstate.fwidth = fontset->mxwidth; g_bgstate.spwidth = fontset->spwidth; diff --git a/apps/examples/nxtext/nxtext_popup.c b/apps/examples/nxtext/nxtext_popup.c index 33170019f..bf9fbae19 100644 --- a/apps/examples/nxtext/nxtext_popup.c +++ b/apps/examples/nxtext/nxtext_popup.c @@ -304,7 +304,7 @@ static inline void nxpu_initstate(void) */ #ifdef CONFIG_NX_KBD - fontset = nxf_getfontset(); + fontset = nxf_getfontset(NXFONT_DEFAULT); g_pustate.fheight = fontset->mxheight; g_pustate.fwidth = fontset->mxwidth; g_pustate.spwidth = fontset->spwidth; diff --git a/apps/examples/nxtext/nxtext_putc.c b/apps/examples/nxtext/nxtext_putc.c index b9c9417a8..87da2ad6e 100644 --- a/apps/examples/nxtext/nxtext_putc.c +++ b/apps/examples/nxtext/nxtext_putc.c @@ -332,7 +332,7 @@ static int nxtext_fontsize(uint8_t ch, FAR struct nxgl_size_s *size) /* No, it is not cached... Does the code map to a font? */ - fbm = nxf_getbitmap(ch); + fbm = nxf_getbitmap(ch, NXFONT_DEFAULT); if (fbm) { /* Yes.. return the font size */ @@ -362,7 +362,7 @@ nxtext_getglyph(FAR struct nxtext_state_s *st, uint8_t ch) { /* No, it is not cached... Does the code map to a font? */ - fbm = nxf_getbitmap(ch); + fbm = nxf_getbitmap(ch, NXFONT_DEFAULT); if (fbm) { /* Yes.. render the glyph */ |