diff options
| author | inmarket <andrewh@inmarket.com.au> | 2013-07-29 16:46:48 +1000 |
|---|---|---|
| committer | inmarket <andrewh@inmarket.com.au> | 2013-07-29 16:46:48 +1000 |
| commit | 44f3256be382a49361b14ec8f56aa43856e1d3bb (patch) | |
| tree | 894743109c764391a92b1b78a2a97062bff46f24 | |
| parent | 31f355460248b2d39969590feefc9482e53c451f (diff) | |
| parent | 9ed89f9ad35f5dbc5fa4afb155bbe87c83f17ac6 (diff) | |
| download | uGFX-44f3256be382a49361b14ec8f56aa43856e1d3bb.tar.gz uGFX-44f3256be382a49361b14ec8f56aa43856e1d3bb.tar.bz2 uGFX-44f3256be382a49361b14ec8f56aa43856e1d3bb.zip | |
Merge branch 'master' into list
| -rw-r--r-- | src/ginput/mouse.c | 2 | ||||
| -rw-r--r-- | src/gwin/checkbox.c | 2 | ||||
| -rw-r--r-- | src/gwin/gwin.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/ginput/mouse.c b/src/ginput/mouse.c index 5459a4cd..74b5a990 100644 --- a/src/ginput/mouse.c +++ b/src/ginput/mouse.c @@ -514,7 +514,7 @@ bool_t ginputCalibrateMouse(uint16_t instance) { #if GFX_USE_GWIN gdispClear(gwinGetDefaultBgColor()); #else - gdispClear(White); + gdispClear(Black); #endif return TRUE; diff --git a/src/gwin/checkbox.c b/src/gwin/checkbox.c index 9121a55b..7a6198de 100644 --- a/src/gwin/checkbox.c +++ b/src/gwin/checkbox.c @@ -190,7 +190,7 @@ void gwinCheckboxDraw_CheckOnRight(GWidgetObject *gw, void *param) { if (gw->g.flags & GCHECKBOX_FLG_CHECKED) gdispFillArea(gw->g.x+ep+df, gw->g.y+df, ld-2*df, ld-2*df, pcol->fill); - gdispFillStringBox(gw->g.x, gw->g.y, ep, gw->g.height, gw->text, gw->g.font, pcol->text, gw->pstyle->background, justifyRight); + gdispFillStringBox(gw->g.x, gw->g.y, ep-1, gw->g.height, gw->text, gw->g.font, pcol->text, gw->pstyle->background, justifyRight); #undef gcw } diff --git a/src/gwin/gwin.c b/src/gwin/gwin.c index f5d78ac6..998fb8d3 100644 --- a/src/gwin/gwin.c +++ b/src/gwin/gwin.c @@ -396,7 +396,7 @@ void gwinBlitArea(GHandle gh, coord_t x, coord_t y, coord_t cx, coord_t cy, coor #if GDISP_NEED_PIXELREAD color_t gwinGetPixelColor(GHandle gh, coord_t x, coord_t y) { if (!((gh->flags & GWIN_FLG_VISIBLE))) - return; + return defaultBgColor; #if GDISP_NEED_CLIP gdispSetClip(gh->x, gh->y, gh->width, gh->height); |