diff options
| author | inmarket <andrewh@inmarket.com.au> | 2018-03-10 20:36:12 +1000 |
|---|---|---|
| committer | inmarket <andrewh@inmarket.com.au> | 2018-03-10 20:36:12 +1000 |
| commit | 94f1cc2f0a4db0c6f1483e6d648068e031bcc094 (patch) | |
| tree | 97f50372239108ec9e6e75a3d56e808e479cb7be /src/ginput | |
| parent | f265924396167729e8d9fb36a0383263f36c1270 (diff) | |
| download | uGFX-94f1cc2f0a4db0c6f1483e6d648068e031bcc094.tar.gz uGFX-94f1cc2f0a4db0c6f1483e6d648068e031bcc094.tar.bz2 uGFX-94f1cc2f0a4db0c6f1483e6d648068e031bcc094.zip | |
Change new colors to GFX_RED instead of GFXRED. Use the new color defs
Diffstat (limited to 'src/ginput')
| -rw-r--r-- | src/ginput/ginput_mouse.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/ginput/ginput_mouse.c b/src/ginput/ginput_mouse.c index f60faccb..356ad11e 100644 --- a/src/ginput/ginput_mouse.c +++ b/src/ginput/ginput_mouse.c @@ -33,9 +33,9 @@ #else #define CALIBRATION_FONT2 "* Narrow" #endif -#define CALIBRATION_BACKGROUND Blue +#define CALIBRATION_BACKGROUND GFX_BLUE -#define CALIBRATION_CROSS_COLOR1 White +#define CALIBRATION_CROSS_COLOR1 GFX_WHITE #define CALIBRATION_CROSS_COLOR2 RGB2COLOR(184,158,131) #define CALIBRATION_CROSS_INNERGAP 2 #define CALIBRATION_CROSS_RADIUS 15 @@ -47,8 +47,8 @@ #endif #define CALIBRATION_TITLE_Y 5 #define CALIBRATION_TITLE_HEIGHT 30 -#define CALIBRATION_TITLE_COLOR White -#define CALIBRATION_TITLE_BACKGROUND Blue +#define CALIBRATION_TITLE_COLOR GFX_WHITE +#define CALIBRATION_TITLE_BACKGROUND GFX_BLUE #ifdef GINPUT_TOUCH_CALIBRATION_ERROR #define CALIBRATION_ERROR_TEXT GINPUT_TOUCH_CALIBRATION_ERROR @@ -56,8 +56,8 @@ #define CALIBRATION_ERROR_TEXT "Calibration Failed!" #endif #define CALIBRATION_ERROR_DELAY 3000 -#define CALIBRATION_ERROR_COLOR Red -#define CALIBRATION_ERROR_BACKGROUND Yellow +#define CALIBRATION_ERROR_COLOR GFX_RED +#define CALIBRATION_ERROR_BACKGROUND GFX_YELLOW #define CALIBRATION_ERROR_Y 35 #define CALIBRATION_ERROR_HEIGHT 40 @@ -500,7 +500,7 @@ static void MousePoll(void *param) { } // Set up the calibration display - gdispGClear(m->display, Blue); + gdispGClear(m->display, GFX_BLUE); #if GDISP_NEED_TEXT gdispGFillStringBox(m->display, 0, CALIBRATION_TITLE_Y, w, CALIBRATION_TITLE_HEIGHT, |