uGFX/ugfx
2
0
Fork 0
Code Issues 2 Pull requests Projects Releases Wiki Activity

Update old demos for new fonts.

Browse source
This commit is contained in:
inmarket 2013-08-17 23:35:18 +10:00
parent 0e707769b4
commit bbdbd637f0
4 changed files with 30 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
demos/modules/gdisp/gdisp_text/gfxconf.h
View file

@ -31,9 +31,9 @@
#define _GFXCONF_H #define _GFXCONF_H
/* The operating system to use - one of these must be defined */ /* The operating system to use - one of these must be defined */
#define GFX_USE_OS_CHIBIOS TRUE //#define GFX_USE_OS_CHIBIOS FALSE
#define GFX_USE_OS_WIN32 FALSE //#define GFX_USE_OS_WIN32 FALSE
#define GFX_USE_OS_POSIX FALSE //#define GFX_USE_OS_POSIX FALSE
/* GFX sub-systems to turn on */ /* GFX sub-systems to turn on */
#define GFX_USE_GDISP TRUE #define GFX_USE_GDISP TRUE
@ -52,4 +52,24 @@
#define GDISP_NEED_ASYNC FALSE #define GDISP_NEED_ASYNC FALSE
#define GDISP_NEED_MSGAPI FALSE #define GDISP_NEED_MSGAPI FALSE
/* GDISP - fonts to include */
#define GDISP_INCLUDE_FONT_DEJAVUSANS10 FALSE
#define GDISP_INCLUDE_FONT_DEJAVUSANS12 FALSE
#define GDISP_INCLUDE_FONT_DEJAVUSANS16 FALSE
#define GDISP_INCLUDE_FONT_DEJAVUSANS24 FALSE
#define GDISP_INCLUDE_FONT_DEJAVUSANS32 FALSE
#define GDISP_INCLUDE_FONT_DEJAVUSANSBOLD12 FALSE
#define GDISP_INCLUDE_FONT_FIXED_10x20 FALSE
#define GDISP_INCLUDE_FONT_FIXED_7x14 FALSE
#define GDISP_INCLUDE_FONT_FIXED_5x8 FALSE
#define GDISP_INCLUDE_FONT_DEJAVUSANS12_AA FALSE
#define GDISP_INCLUDE_FONT_DEJAVUSANS16_AA FALSE
#define GDISP_INCLUDE_FONT_DEJAVUSANS24_AA FALSE
#define GDISP_INCLUDE_FONT_DEJAVUSANS32_AA FALSE
#define GDISP_INCLUDE_FONT_DEJAVUSANSBOLD12_AA FALSE
#define GDISP_INCLUDE_FONT_UI1 FALSE
#define GDISP_INCLUDE_FONT_UI2 TRUE
#define GDISP_INCLUDE_FONT_LARGENUMBERS TRUE
#endif /* _GFXCONF_H */ #endif /* _GFXCONF_H */

8
demos/modules/gwin/console/gfxconf.h
View file

@ -31,9 +31,9 @@
#define _GFXCONF_H #define _GFXCONF_H
/* The operating system to use - one of these must be defined */ /* The operating system to use - one of these must be defined */
#define GFX_USE_OS_CHIBIOS TRUE //#define GFX_USE_OS_CHIBIOS FALSE
#define GFX_USE_OS_WIN32 FALSE //#define GFX_USE_OS_WIN32 FALSE
#define GFX_USE_OS_POSIX FALSE //#define GFX_USE_OS_POSIX FALSE
/* GFX sub-systems to turn on */ /* GFX sub-systems to turn on */
#define GFX_USE_GDISP TRUE #define GFX_USE_GDISP TRUE
@ -54,7 +54,7 @@
#define GDISP_NEED_MSGAPI FALSE #define GDISP_NEED_MSGAPI FALSE
/* Builtin Fonts */ /* Builtin Fonts */
#define GDISP_INCLUDE_FONT_SMALL TRUE #define GDISP_INCLUDE_FONT_SMALL FALSE
#define GDISP_INCLUDE_FONT_LARGER FALSE #define GDISP_INCLUDE_FONT_LARGER FALSE
#define GDISP_INCLUDE_FONT_UI1 FALSE #define GDISP_INCLUDE_FONT_UI1 FALSE
#define GDISP_INCLUDE_FONT_UI2 TRUE #define GDISP_INCLUDE_FONT_UI2 TRUE

2
demos/modules/gwin/console/main.c
View file

@ -40,7 +40,7 @@ int main(void) {
gfxInit(); gfxInit();
/* Set some fonts */ /* Set some fonts */
font1 = gdispOpenFont("Small"); font1 = gdispOpenFont("UI2");
font2 = gdispOpenFont("UI2 Double"); font2 = gdispOpenFont("UI2 Double");
gwinSetDefaultFont(font1); gwinSetDefaultFont(font1);

4
demos/modules/gwin/widgets/gfxconf.h
View file

@ -57,8 +57,8 @@
#define GDISP_NEED_MSGAPI FALSE #define GDISP_NEED_MSGAPI FALSE
/* Builtin Fonts */ /* Builtin Fonts */
#define GDISP_INCLUDE_FONT_DEJAVUSANS12 TRUE #define GDISP_INCLUDE_FONT_UI2 TRUE
#define GDISP_NEED_ANTIALIAS TRUE #define GDISP_NEED_ANTIALIAS FALSE
/* GDISP image decoders */ /* GDISP image decoders */
#define GDISP_NEED_IMAGE_NATIVE FALSE #define GDISP_NEED_IMAGE_NATIVE FALSE