diff options
| author | inmarket <andrewh@inmarket.com.au> | 2013-08-17 23:32:53 +1000 |
|---|---|---|
| committer | inmarket <andrewh@inmarket.com.au> | 2013-08-17 23:32:53 +1000 |
| commit | a2b27a6f5c404a8b8883c0f7d50279550120035a (patch) | |
| tree | 6bf7bc58c59e6a94844f97e3596c2ffc84ced3c2 /include/gfx_rules.h | |
| parent | 964ebc6e4a4ac647ad6c28bf8820f60fedcc0a95 (diff) | |
| download | uGFX-a2b27a6f5c404a8b8883c0f7d50279550120035a.tar.gz uGFX-a2b27a6f5c404a8b8883c0f7d50279550120035a.tar.bz2 uGFX-a2b27a6f5c404a8b8883c0f7d50279550120035a.zip | |
Add new hand built bitmap fonts to replace old UI1 and UI2.
Allow scaled fonts to be staticly defined.
Update new fonts handling so UI1 and UI2 have Narrow and Double variants.
Update example gfxconf.h.
Fix new font rules.
Add support for an application program to add their own fonts.
Make system font handling includes root relative.
Diffstat (limited to 'include/gfx_rules.h')
| -rw-r--r-- | include/gfx_rules.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/include/gfx_rules.h b/include/gfx_rules.h index 375c043f..afd2a8fe 100644 --- a/include/gfx_rules.h +++ b/include/gfx_rules.h @@ -159,10 +159,9 @@ #endif #endif #endif - #if (defined(GDISP_INCLUDE_FONT_SMALL) && GDISP_INCLUDE_FONT_SMALL) || (defined(GDISP_INCLUDE_FONT_LARGER) && GDISP_INCLUDE_FONT_LARGER) \ - || (defined(GDISP_INCLUDE_FONT_UI1) && GDISP_INCLUDE_FONT_UI1) || (defined(GDISP_INCLUDE_FONT_UI2) && GDISP_INCLUDE_FONT_UI2) + #if (defined(GDISP_INCLUDE_FONT_SMALL) && GDISP_INCLUDE_FONT_SMALL) || (defined(GDISP_INCLUDE_FONT_LARGER) && GDISP_INCLUDE_FONT_LARGER) #if GFX_DISPLAY_RULE_WARNINGS - #warning "GDISP: An old font (Small, Larger, UI1, UI2) has been defined. A single default font of DEJAVUSANS12 has been added instead." + #warning "GDISP: An old font (Small or Larger) has been defined. A single default font of DEJAVUSANS12 has been added instead." #warning "GDISP: Please see <$(GFXLIB)/include/gdisp/fonts/fonts.h> for a list of available font names." #endif #undef GDISP_INCLUDE_FONT_DEJAVUSANS12 |