From 2ab2d77fcba42467b62f2be732cb8dc00510fe19 Mon Sep 17 00:00:00 2001 From: inmarket Date: Sun, 8 Jul 2018 10:54:19 +1000 Subject: Change coord_t to gCoord --- demos/applications/combo/bounce.c | 6 +++--- demos/applications/combo/main.c | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'demos/applications/combo') diff --git a/demos/applications/combo/bounce.c b/demos/applications/combo/bounce.c index d3709056..33bb8394 100644 --- a/demos/applications/combo/bounce.c +++ b/demos/applications/combo/bounce.c @@ -63,9 +63,9 @@ static gfxThreadHandle thread; #define SHADOWALPHA (255-255*0.2) static DECLARE_THREAD_FUNCTION(task, param) { - coord_t width, height, x, y, radius, ballx, bally, dx, floor; - coord_t minx, miny, maxx, maxy, winx, winy; - coord_t ballcx, ballcy; + gCoord width, height, x, y, radius, ballx, bally, dx, floor; + gCoord minx, miny, maxx, maxy, winx, winy; + gCoord ballcx, ballcy; color_t colour; float ii, spin, dy, spinspeed, h, f, g; (void) param; diff --git a/demos/applications/combo/main.c b/demos/applications/combo/main.c index 05cdb643..1e7c6584 100644 --- a/demos/applications/combo/main.c +++ b/demos/applications/combo/main.c @@ -115,14 +115,14 @@ static void nextline(GWidgetInit *pwi) { pwi->g.y += pwi->g.height+1; } -static void setbtntext(GWidgetInit *pwi, coord_t maxwidth, char *txt) { +static void setbtntext(GWidgetInit *pwi, gCoord maxwidth, char *txt) { pwi->text = txt; pwi->g.width = gdispGetStringWidth(pwi->text, font) + BUTTON_PADDING; if (pwi->g.x + pwi->g.width > maxwidth) nextline(pwi); } -static void nextpos(GWidgetInit *pwi, coord_t maxwidth, coord_t nextwidth) { +static void nextpos(GWidgetInit *pwi, gCoord maxwidth, gCoord nextwidth) { pwi->g.x += pwi->g.width+1; pwi->g.width = nextwidth; if (pwi->g.x + nextwidth > maxwidth) @@ -138,7 +138,7 @@ static void nextpos(GWidgetInit *pwi, coord_t maxwidth, coord_t nextwidth) { */ static void createWidgets(void) { GWidgetInit wi; - coord_t border, pagewidth; + gCoord border, pagewidth; gwinWidgetClearInit(&wi); -- cgit v1.2.3