diff options
author | inmarket <andrewh@inmarket.com.au> | 2018-07-08 12:19:30 +1000 |
---|---|---|
committer | inmarket <andrewh@inmarket.com.au> | 2018-07-08 12:19:30 +1000 |
commit | 2e8eaa34717f99c9696867b62ff5f19e76a7ccf8 (patch) | |
tree | 5842c0ccaaffd195430b83fd2bd9211bd6f1fffe /demos/modules/gdisp/fonts/main.c | |
parent | 788cbced624d83a4c493182fde15cfa244910294 (diff) | |
download | uGFX-2e8eaa34717f99c9696867b62ff5f19e76a7ccf8.tar.gz uGFX-2e8eaa34717f99c9696867b62ff5f19e76a7ccf8.tar.bz2 uGFX-2e8eaa34717f99c9696867b62ff5f19e76a7ccf8.zip |
Added type gJustify to replace V2.x justify_t, and values gJustifyXXX replace justifyXXX
Diffstat (limited to 'demos/modules/gdisp/fonts/main.c')
-rw-r--r-- | demos/modules/gdisp/fonts/main.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/demos/modules/gdisp/fonts/main.c b/demos/modules/gdisp/fonts/main.c index d7852a93..9c351de8 100644 --- a/demos/modules/gdisp/fonts/main.c +++ b/demos/modules/gdisp/fonts/main.c @@ -60,21 +60,21 @@ int main(void) { line2 = "0123456789~!@#$%^&*_-+=(){}[]<>|/\\:;,.?'\"`"; // Font 1 - gdispFillStringBox(0, y, width, fheight1, line1, font1, GFX_BLACK, GFX_WHITE, justifyCenter); + gdispFillStringBox(0, y, width, fheight1, line1, font1, GFX_BLACK, GFX_WHITE, gJustifyCenter); y += fheight1+1; - gdispFillStringBox(0, y, width, fheight1, line2, font1, GFX_BLACK, GFX_WHITE, justifyCenter); + gdispFillStringBox(0, y, width, fheight1, line2, font1, GFX_BLACK, GFX_WHITE, gJustifyCenter); y += fheight1+1; // Font 2 - gdispFillStringBox(0, y, width, fheight2, line1, font2, GFX_BLACK, GFX_WHITE, justifyCenter); + gdispFillStringBox(0, y, width, fheight2, line1, font2, GFX_BLACK, GFX_WHITE, gJustifyCenter); y += fheight2+1; - gdispFillStringBox(0, y, width, fheight2, line2, font2, GFX_BLACK, GFX_WHITE, justifyCenter); + gdispFillStringBox(0, y, width, fheight2, line2, font2, GFX_BLACK, GFX_WHITE, gJustifyCenter); y += fheight2+1; // Font 1 drawing White on the (black) background - gdispDrawStringBox(0, y, width, fheight1, line1, font1, GFX_WHITE, justifyCenter); + gdispDrawStringBox(0, y, width, fheight1, line1, font1, GFX_WHITE, gJustifyCenter); y += fheight1+1; - gdispDrawStringBox(0, y, width, fheight1, line2, font1, GFX_WHITE, justifyCenter); + gdispDrawStringBox(0, y, width, fheight1, line2, font1, GFX_WHITE, gJustifyCenter); y += fheight1+1; // Show Sizes @@ -85,7 +85,7 @@ int main(void) { buf[4] = (fheight2-2)/10 + '0'; buf[5] = (fheight2-2)%10 + '0'; buf[6] = 0; - gdispFillStringBox(0, y, width, fheight1, buf, font1, GFX_RED, GFX_WHITE, justifyCenter); + gdispFillStringBox(0, y, width, fheight1, buf, font1, GFX_RED, GFX_WHITE, gJustifyCenter); // Wait forever while(1) { |