diff options
| author | Joel Bodenmann <joel@unormal.org> | 2014-05-06 17:20:22 +0200 |
|---|---|---|
| committer | Joel Bodenmann <joel@unormal.org> | 2014-05-06 17:20:22 +0200 |
| commit | f7fa0dd78f3b807578d99cc0eefe40996b1f9037 (patch) | |
| tree | 56a12a955752212e59ee4e4258bd2cb9806e9c31 /src | |
| parent | cb99e4ab091fafbee0389a30b6fbe8ee0ffc778e (diff) | |
| parent | c2e93ebcfbb781b4295e4cb82b858500765c6ea6 (diff) | |
| download | uGFX-f7fa0dd78f3b807578d99cc0eefe40996b1f9037.tar.gz uGFX-f7fa0dd78f3b807578d99cc0eefe40996b1f9037.tar.bz2 uGFX-f7fa0dd78f3b807578d99cc0eefe40996b1f9037.zip | |
Merge branch 'master' into gwin
Diffstat (limited to 'src')
| -rw-r--r-- | src/gdisp/gdisp.c | 2 | ||||
| -rw-r--r-- | src/gwin/radio.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/gdisp/gdisp.c b/src/gdisp/gdisp.c index 2ac55f1b..9f3ff11b 100644 --- a/src/gdisp/gdisp.c +++ b/src/gdisp/gdisp.c @@ -1415,7 +1415,7 @@ void gdispGBlitArea(GDisplay *g, coord_t x, coord_t y, coord_t cx, coord_t cy, c if (full & 0x30) { g->p.x = x-a; g->p.y = y+b; drawpixel_clip(g); } if (full == 0xFF) { autoflush(g); - MUTEX_EXIT(); + MUTEX_EXIT(g); return; } } diff --git a/src/gwin/radio.c b/src/gwin/radio.c index 8dc3ba6b..0ae5546a 100644 --- a/src/gwin/radio.c +++ b/src/gwin/radio.c @@ -21,7 +21,7 @@ #include "src/gwin/class_gwin.h" -#define GRADIO_TAB_CNR 3 // Diagonal corner on active tab +#define GRADIO_TAB_CNR 8 // Diagonal corner on active tab #define GRADIO_TOP_FADE 50 // (GRADIO_TOP_FADE/255)% fade to white for top of tab/button #define GRADIO_BOTTOM_FADE 25 // (GRADIO_BOTTOM_FADE/255)% fade to black for bottom of tab/button #define GRADIO_OUTLINE_FADE 128 // (GRADIO_OUTLINE_FADE/255)% fade to background for active tab edge |