aboutsummaryrefslogtreecommitdiffstats
path: root/demos/applications/notepad
diff options
context:
space:
mode:
authorinmarket <andrewh@inmarket.com.au>2013-07-29 17:26:33 +1000
committerinmarket <andrewh@inmarket.com.au>2013-07-29 17:26:33 +1000
commitab04b1d0762fb22a28aa340da273a9165c12953b (patch)
treef7ff80521a61a4805907b78718a94f8a631b1e72 /demos/applications/notepad
parente5b0168d7c5b03119fe12818279a862cc8273827 (diff)
downloaduGFX-ab04b1d0762fb22a28aa340da273a9165c12953b.tar.gz
uGFX-ab04b1d0762fb22a28aa340da273a9165c12953b.tar.bz2
uGFX-ab04b1d0762fb22a28aa340da273a9165c12953b.zip
Update notepad demo for anti-aliased fonts
Diffstat (limited to 'demos/applications/notepad')
-rw-r--r--demos/applications/notepad/gfxconf.h11
-rw-r--r--demos/applications/notepad/main.c4
2 files changed, 8 insertions, 7 deletions
diff --git a/demos/applications/notepad/gfxconf.h b/demos/applications/notepad/gfxconf.h
index f3f50009..95d5dc5e 100644
--- a/demos/applications/notepad/gfxconf.h
+++ b/demos/applications/notepad/gfxconf.h
@@ -31,9 +31,9 @@
#define _GFXCONF_H
/* The operating system to use - one of these must be defined */
-#define GFX_USE_OS_CHIBIOS TRUE
-#define GFX_USE_OS_WIN32 FALSE
-#define GFX_USE_OS_POSIX FALSE
+//#define GFX_USE_OS_CHIBIOS TRUE
+//#define GFX_USE_OS_WIN32 FALSE
+//#define GFX_USE_OS_POSIX FALSE
/* GFX sub-systems to turn on */
#define GFX_USE_GDISP TRUE
@@ -57,8 +57,9 @@
#define GDISP_NEED_MSGAPI FALSE
/* Builtin Fonts */
-#define GDISP_INCLUDE_FONT_DEJAVUSANS12 TRUE
-#define GDISP_INCLUDE_FONT_DEJAVUSANS24 TRUE
+#define GDISP_INCLUDE_FONT_DEJAVUSANS12_AA TRUE
+#define GDISP_INCLUDE_FONT_DEJAVUSANS24_AA TRUE
+#define GDISP_NEED_ANTIALIAS TRUE
/* Features for the GINPUT sub-system. */
#define GINPUT_NEED_MOUSE TRUE
diff --git a/demos/applications/notepad/main.c b/demos/applications/notepad/main.c
index 020a2b60..24c292c4 100644
--- a/demos/applications/notepad/main.c
+++ b/demos/applications/notepad/main.c
@@ -46,8 +46,8 @@ void drawScreen(void) {
char *msg = "ChibiOS/GFX";
font_t font1, font2;
- font1 = gdispOpenFont("DejaVuSans24");
- font2 = gdispOpenFont("DejaVuSans12");
+ font1 = gdispOpenFont("DejaVuSans24*");
+ font2 = gdispOpenFont("DejaVuSans12*");
gdispClear(White);
gdispDrawString(gdispGetWidth()-gdispGetStringWidth(msg, font1)-3, 3, msg, font1, Black);