diff options
| author | Joel Bodenmann <joel@unormal.org> | 2013-07-28 14:13:13 +0200 |
|---|---|---|
| committer | Joel Bodenmann <joel@unormal.org> | 2013-07-28 14:13:13 +0200 |
| commit | 30df14b595c0a795943a9593ea32d23cf53d148f (patch) | |
| tree | 737a4453517ae958d499f92bf8a8098a3663b0ec | |
| parent | 423c28b40e0849838615e575630d8e251f04739b (diff) | |
| parent | 580cf977d07820774efd8abcf067f015422b7e55 (diff) | |
| download | uGFX-30df14b595c0a795943a9593ea32d23cf53d148f.tar.gz uGFX-30df14b595c0a795943a9593ea32d23cf53d148f.tar.bz2 uGFX-30df14b595c0a795943a9593ea32d23cf53d148f.zip | |
Merge branch 'master' into list
| -rw-r--r-- | src/ginput/mouse.c | 7 | ||||
| -rw-r--r-- | src/gqueue/gqueue.c | 4 |
2 files changed, 9 insertions, 2 deletions
diff --git a/src/ginput/mouse.c b/src/ginput/mouse.c index 28707d8b..5459a4cd 100644 --- a/src/ginput/mouse.c +++ b/src/ginput/mouse.c @@ -509,6 +509,13 @@ bool_t ginputCalibrateMouse(uint16_t instance) { MouseConfig.fnsavecal(instance, (const uint8_t *)&MouseConfig.caldata, sizeof(MouseConfig.caldata)); MouseConfig.flags |= FLG_CAL_SAVED; } + + // Clear the screen using the GWIN default background color + #if GFX_USE_GWIN + gdispClear(gwinGetDefaultBgColor()); + #else + gdispClear(White); + #endif return TRUE; #endif diff --git a/src/gqueue/gqueue.c b/src/gqueue/gqueue.c index 8b27bd41..f73c43df 100644 --- a/src/gqueue/gqueue.c +++ b/src/gqueue/gqueue.c @@ -103,7 +103,7 @@ pi = pqueue->head; pqueue->head = pi->next; pi->next = 0; - gfxSytemUnlock(); + gfxSystemUnlock(); return pi; } void gfxQueueGSyncPut(gfxQueueGSync *pqueue, gfxQueueGSyncItem *pitem) { @@ -184,7 +184,7 @@ pi = pqueue->head; pqueue->head = pi->next; pi->next = 0; - gfxSytemUnlock(); + gfxSystemUnlock(); gfxSemSignalI(&pi->sem); gfxSemDestroy(&pi->sem); |