diff options
| author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2011-07-27 14:43:45 +0000 |
|---|---|---|
| committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2011-07-27 14:43:45 +0000 |
| commit | 99ffb319c5af373ef135c2a3e73bf1171e55559e (patch) | |
| tree | 7aa08fa81a006d354469de2652043ab969d8a3c4 /apps/examples/nxtext/nxtext_popup.c | |
| parent | ce09509ff8c3127b4cc07ebcaae78229d5b2d90a (diff) | |
| download | nuttx-99ffb319c5af373ef135c2a3e73bf1171e55559e.tar.gz nuttx-99ffb319c5af373ef135c2a3e73bf1171e55559e.tar.bz2 nuttx-99ffb319c5af373ef135c2a3e73bf1171e55559e.zip | |
Incorporated new fonts into examples; fix glyph allocation bug in nxhello
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@3822 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'apps/examples/nxtext/nxtext_popup.c')
| -rw-r--r-- | apps/examples/nxtext/nxtext_popup.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/apps/examples/nxtext/nxtext_popup.c b/apps/examples/nxtext/nxtext_popup.c index c0c66f4ef..f00f6a040 100644 --- a/apps/examples/nxtext/nxtext_popup.c +++ b/apps/examples/nxtext/nxtext_popup.c @@ -196,7 +196,7 @@ static inline void nxpu_fillwindow(NXWINDOW hwnd, nxtext_home(st); for (i = 0; i < st->nchars; i++) { - nxtext_fillchar(hwnd, rect, st, &st->bm[i]); + nxtext_fillchar(hwnd, rect, st, g_puhfont, &st->bm[i]); } #endif } @@ -265,7 +265,7 @@ static inline void nxpu_puts(NXWINDOW hwnd, FAR struct nxtext_state_s *st, nxtext_home(st); while (nch--) { - nxtext_putc(hwnd, st, *ch++); + nxtext_putc(hwnd, st, g_puhfont, *ch++); } } @@ -304,7 +304,7 @@ static inline void nxpu_initstate(void) */ #ifdef CONFIG_NX_KBD - fontset = nxf_getfontset(g_fonthandle); + fontset = nxf_getfontset(g_puhfont); g_pustate.fheight = fontset->mxheight; g_pustate.fwidth = fontset->mxwidth; g_pustate.spwidth = fontset->spwidth; |