diff options
| author | inmarket <andrewh@inmarket.com.au> | 2013-07-29 16:21:36 +1000 |
|---|---|---|
| committer | inmarket <andrewh@inmarket.com.au> | 2013-07-29 16:21:36 +1000 |
| commit | 3ac4e9e789b7f0d5a9d18f9073a09d4e7a4fd3f0 (patch) | |
| tree | a8334785c8ae7ce68d53742d0d1b4fb9d94b7cf4 /demos | |
| parent | be8b3cd2102f4c2fe66307d81c8c04391292cf1f (diff) | |
| download | uGFX-3ac4e9e789b7f0d5a9d18f9073a09d4e7a4fd3f0.tar.gz uGFX-3ac4e9e789b7f0d5a9d18f9073a09d4e7a4fd3f0.tar.bz2 uGFX-3ac4e9e789b7f0d5a9d18f9073a09d4e7a4fd3f0.zip | |
Update widgets demo for new fonts
Diffstat (limited to 'demos')
| -rw-r--r-- | demos/modules/gwin/widgets/gfxconf.h | 7 | ||||
| -rw-r--r-- | demos/modules/gwin/widgets/main.c | 2 |
2 files changed, 3 insertions, 6 deletions
diff --git a/demos/modules/gwin/widgets/gfxconf.h b/demos/modules/gwin/widgets/gfxconf.h index f8d8fe5f..08c350b6 100644 --- a/demos/modules/gwin/widgets/gfxconf.h +++ b/demos/modules/gwin/widgets/gfxconf.h @@ -57,11 +57,8 @@ #define GDISP_NEED_MSGAPI FALSE /* Builtin Fonts */ -#define GDISP_INCLUDE_FONT_SMALL FALSE -#define GDISP_INCLUDE_FONT_LARGER FALSE -#define GDISP_INCLUDE_FONT_UI1 FALSE -#define GDISP_INCLUDE_FONT_UI2 TRUE -#define GDISP_INCLUDE_FONT_LARGENUMBERS FALSE +#define GDISP_INCLUDE_FONT_DEJAVUSANS12 TRUE +#define GDISP_NEED_ANTIALIAS TRUE /* GDISP image decoders */ #define GDISP_NEED_IMAGE_NATIVE FALSE diff --git a/demos/modules/gwin/widgets/main.c b/demos/modules/gwin/widgets/main.c index bff842f4..5a2c22d9 100644 --- a/demos/modules/gwin/widgets/main.c +++ b/demos/modules/gwin/widgets/main.c @@ -226,7 +226,7 @@ int main(void) { gfxInit(); // Set the widget defaults - gwinSetDefaultFont(gdispOpenFont("UI2")); + gwinSetDefaultFont(gdispOpenFont("*")); gwinSetDefaultStyle(&WhiteWidgetStyle, FALSE); gdispClear(White); |