diff options
Diffstat (limited to 'demos/modules')
| -rw-r--r-- | demos/modules/gdisp/fonts/main.c | 14 | ||||
| -rw-r--r-- | demos/modules/gdisp/multiple_displays/main.c | 8 | ||||
| -rw-r--r-- | demos/modules/gtrans/basic/main.c | 8 |
3 files changed, 15 insertions, 15 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) { diff --git a/demos/modules/gdisp/multiple_displays/main.c b/demos/modules/gdisp/multiple_displays/main.c index b753fc04..5df0e479 100644 --- a/demos/modules/gdisp/multiple_displays/main.c +++ b/demos/modules/gdisp/multiple_displays/main.c @@ -72,10 +72,10 @@ sprintg(buf, "Display %u", display); if (width < 128) { gdispGDrawBox(g, 0, 0, width/2, height/2, GFX_YELLOW); - gdispGFillStringBox(g, 0, height/2, width, height/2, buf, f, GFX_BLACK, GFX_BLUE, justifyCenter); + gdispGFillStringBox(g, 0, height/2, width, height/2, buf, f, GFX_BLACK, GFX_BLUE, gJustifyCenter); } else { gdispGDrawBox(g, 10, 10, width/2, height/2, GFX_YELLOW); - gdispGFillStringBox(g, width/2, height/2, width/2-10, height/2-10, buf, f, GFX_WHITE, GFX_BLUE, justifyCenter); + gdispGFillStringBox(g, width/2, height/2, width/2-10, height/2-10, buf, f, GFX_WHITE, GFX_BLUE, gJustifyCenter); } gdispGDrawLine(g, 5, 30, width-50, height-40, GFX_RED); @@ -115,10 +115,10 @@ sprintg(buf, "Display %u", display); if (width < 128) { gdispDrawBox(0, 0, width/2, height/2, GFX_YELLOW); - gdispFillStringBox(0, height/2, width, height/2, buf, f, GFX_BLACK, GFX_BLUE, justifyCenter); + gdispFillStringBox(0, height/2, width, height/2, buf, f, GFX_BLACK, GFX_BLUE, gJustifyCenter); } else { gdispDrawBox(10, 10, width/2, height/2, GFX_YELLOW); - gdispFillStringBox(width/2, height/2, width/2-10, height/2-10, buf, f, GFX_WHITE, GFX_BLUE, justifyCenter); + gdispFillStringBox(width/2, height/2, width/2-10, height/2-10, buf, f, GFX_WHITE, GFX_BLUE, gJustifyCenter); } gdispDrawLine(5, 30, width-50, height-40, GFX_RED); diff --git a/demos/modules/gtrans/basic/main.c b/demos/modules/gtrans/basic/main.c index 1a1657cf..283a7211 100644 --- a/demos/modules/gtrans/basic/main.c +++ b/demos/modules/gtrans/basic/main.c @@ -68,14 +68,14 @@ void updateText() gCoord height = 30; // Translate some basic strings - gdispFillStringBox(20, 20, width, height, gt("Welcome"), font, COLOR_TEXT, COLOR_BACKGROUND, justifyLeft); - gdispFillStringBox(20, 60, width, height, gt("This is a translated uGFX application"), font, COLOR_TEXT, COLOR_BACKGROUND, justifyLeft); - gdispFillStringBox(20, 100, width, height, gt("Goodbye"), font, COLOR_TEXT, COLOR_BACKGROUND, justifyLeft); + gdispFillStringBox(20, 20, width, height, gt("Welcome"), font, COLOR_TEXT, COLOR_BACKGROUND, gJustifyLeft); + gdispFillStringBox(20, 60, width, height, gt("This is a translated uGFX application"), font, COLOR_TEXT, COLOR_BACKGROUND, gJustifyLeft); + gdispFillStringBox(20, 100, width, height, gt("Goodbye"), font, COLOR_TEXT, COLOR_BACKGROUND, gJustifyLeft); // A more complex example using string formatting char buffer[128]; sprintf(buffer, gt("The temperature is %d degrees"), 18); - gdispFillStringBox(20, 140, width, height, buffer, font, COLOR_TEXT, COLOR_BACKGROUND, justifyLeft); + gdispFillStringBox(20, 140, width, height, buffer, font, COLOR_TEXT, COLOR_BACKGROUND, gJustifyLeft); } int main(void) |