uGFX/ugfx
2
0
Fork 0
Code Issues 2 Pull requests Projects Releases Wiki Activity

Merge branch 'master' into list

Browse source
This commit is contained in:
inmarket 2013-07-29 16:46:48 +10:00
commit 44f3256be3
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/ginput/mouse.c
View file

@ -514,7 +514,7 @@ bool_t ginputCalibrateMouse(uint16_t instance) {
#if GFX_USE_GWIN #if GFX_USE_GWIN
gdispClear(gwinGetDefaultBgColor()); gdispClear(gwinGetDefaultBgColor());
#else #else
gdispClear(White); gdispClear(Black);
#endif #endif
return TRUE; return TRUE;

2
src/gwin/checkbox.c
View file

@ -190,7 +190,7 @@ void gwinCheckboxDraw_CheckOnRight(GWidgetObject *gw, void *param) {
if (gw->g.flags & GCHECKBOX_FLG_CHECKED) 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); 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 #undef gcw
} }

2
src/gwin/gwin.c
View file

@ -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 #if GDISP_NEED_PIXELREAD
color_t gwinGetPixelColor(GHandle gh, coord_t x, coord_t y) { color_t gwinGetPixelColor(GHandle gh, coord_t x, coord_t y) {
if (!((gh->flags & GWIN_FLG_VISIBLE))) if (!((gh->flags & GWIN_FLG_VISIBLE)))
return; return defaultBgColor;
#if GDISP_NEED_CLIP #if GDISP_NEED_CLIP
gdispSetClip(gh->x, gh->y, gh->width, gh->height); gdispSetClip(gh->x, gh->y, gh->width, gh->height);