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

Update font demo to show Anti-aliased drawing

Browse Source
This commit is contained in:
inmarket 2017-01-18 14:27:25 +10:00
parent b8ece23f18
commit 9360b27250
2 changed files with 27 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
demos/modules/gdisp/fonts/gfxconf.h
View File

@ -50,9 +50,10 @@
#define GDISP_INCLUDE_FONT_UI1 FALSE #define GDISP_INCLUDE_FONT_UI1 FALSE
#define GDISP_INCLUDE_FONT_UI2 TRUE #define GDISP_INCLUDE_FONT_UI2 TRUE
#define GDISP_INCLUDE_FONT_LARGENUMBERS FALSE #define GDISP_INCLUDE_FONT_LARGENUMBERS FALSE
#define GDISP_INCLUDE_FONT_DEJAVUSANS10 TRUE #define GDISP_INCLUDE_FONT_DEJAVUSANS10 FALSE
#define GDISP_INCLUDE_FONT_DEJAVUSANS12 FALSE #define GDISP_INCLUDE_FONT_DEJAVUSANS12 FALSE
#define GDISP_INCLUDE_FONT_DEJAVUSANS16 FALSE #define GDISP_INCLUDE_FONT_DEJAVUSANS16 FALSE
#define GDISP_INCLUDE_FONT_DEJAVUSANS20 FALSE
#define GDISP_INCLUDE_FONT_DEJAVUSANS24 FALSE #define GDISP_INCLUDE_FONT_DEJAVUSANS24 FALSE
#define GDISP_INCLUDE_FONT_DEJAVUSANS32 FALSE #define GDISP_INCLUDE_FONT_DEJAVUSANS32 FALSE
#define GDISP_INCLUDE_FONT_DEJAVUSANSBOLD12 FALSE #define GDISP_INCLUDE_FONT_DEJAVUSANSBOLD12 FALSE
@ -61,6 +62,7 @@
#define GDISP_INCLUDE_FONT_FIXED_5x8 FALSE #define GDISP_INCLUDE_FONT_FIXED_5x8 FALSE
#define GDISP_INCLUDE_FONT_DEJAVUSANS12_AA FALSE #define GDISP_INCLUDE_FONT_DEJAVUSANS12_AA FALSE
#define GDISP_INCLUDE_FONT_DEJAVUSANS16_AA FALSE #define GDISP_INCLUDE_FONT_DEJAVUSANS16_AA FALSE
#define GDISP_INCLUDE_FONT_DEJAVUSANS20_AA TRUE
#define GDISP_INCLUDE_FONT_DEJAVUSANS24_AA FALSE #define GDISP_INCLUDE_FONT_DEJAVUSANS24_AA FALSE
#define GDISP_INCLUDE_FONT_DEJAVUSANS32_AA FALSE #define GDISP_INCLUDE_FONT_DEJAVUSANS32_AA FALSE
#define GDISP_INCLUDE_FONT_DEJAVUSANSBOLD12_AA FALSE #define GDISP_INCLUDE_FONT_DEJAVUSANSBOLD12_AA FALSE

33
demos/modules/gdisp/fonts/main.c
View File

@ -30,7 +30,7 @@
#include "gfx.h" #include "gfx.h"
int main(void) { int main(void) {
coord_t width; coord_t width, y;
font_t font1, font2; font_t font1, font2;
coord_t fheight1, fheight2; coord_t fheight1, fheight2;
const char *line1, *line2; const char *line1, *line2;
@ -52,17 +52,30 @@ int main(void) {
//font2 = gdispOpenFont("PF Ronda*"); //font2 = gdispOpenFont("PF Ronda*");
//font2 = gdispOpenFont("Apple*"); //font2 = gdispOpenFont("Apple*");
// Font 1 y = 0;
line1 = "a b c d e f h i j k l m n o p q r s t u v w x y z A B C D E F G H I J K L M N O P Q R S T U V W X Y Z";
line2 = "0 1 2 3 4 5 6 7 8 9 ~ ! @ # $ % ^ & * _ - + = ( ) { } [ ] < > | / \\ : ; , . ? ' \" `";
fheight1 = gdispGetFontMetric(font1, fontHeight)+2; fheight1 = gdispGetFontMetric(font1, fontHeight)+2;
gdispFillStringBox(0, 0, width, fheight1, line1, font1, Black, White, justifyCenter); fheight2 = gdispGetFontMetric(font2, fontHeight)+2;
gdispFillStringBox(0, fheight1+1, width, fheight1, line2, font1, Black, White, justifyCenter);
line1 = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ";
line2 = "0123456789~!@#$%^&*_-+=(){}[]<>|/\\:;,.?'\"`";
// Font 1
gdispFillStringBox(0, y, width, fheight1, line1, font1, Black, White, justifyCenter);
y += fheight1+1;
gdispFillStringBox(0, y, width, fheight1, line2, font1, Black, White, justifyCenter);
y += fheight1+1;
// Font 2 // Font 2
fheight2 = gdispGetFontMetric(font2, fontHeight)+2; gdispFillStringBox(0, y, width, fheight2, line1, font2, Black, White, justifyCenter);
gdispFillStringBox(0, 2*fheight1+2, width, fheight2, line1, font2, Black, White, justifyCenter); y += fheight2+1;
gdispFillStringBox(0, 2*fheight1+fheight2+3, width, fheight2, line2, font2, Black, White, justifyCenter); gdispFillStringBox(0, y, width, fheight2, line2, font2, Black, White, justifyCenter);
y += fheight2+1;
// Font 1 drawing White on the (black) background
gdispDrawStringBox(0, y, width, fheight1, line1, font1, White, justifyCenter);
y += fheight1+1;
gdispDrawStringBox(0, y, width, fheight1, line2, font1, White, justifyCenter);
y += fheight1+1;
// Show Sizes // Show Sizes
buf[0] = (fheight1-2)/10 + '0'; buf[0] = (fheight1-2)/10 + '0';
@ -72,7 +85,7 @@ int main(void) {
buf[4] = (fheight2-2)/10 + '0'; buf[4] = (fheight2-2)/10 + '0';
buf[5] = (fheight2-2)%10 + '0'; buf[5] = (fheight2-2)%10 + '0';
buf[6] = 0; buf[6] = 0;
gdispFillStringBox(0, 2*fheight1+2*fheight2+4, width, fheight1, buf, font1, Red, White, justifyCenter); gdispFillStringBox(0, y, width, fheight1, buf, font1, Red, White, justifyCenter);
// Wait forever // Wait forever
while(TRUE) { while(TRUE) {