Merge branch 'master' into gwin

ugfx_release_2.6
Joel Bodenmann 2014-05-06 17:20:22 +02:00
commit f7fa0dd78f
2 changed files with 2 additions and 2 deletions

View File

@ -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;
}
}

View File

@ -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