Conflicts:
	src/gui/timerlist.cpp


Origin commit data
------------------
Commit: 94d3ba6d1e
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-21 (Wed, 21 Jun 2017)
This commit is contained in:
vanhofen
2017-06-21 11:43:58 +02:00
3 changed files with 7 additions and 3 deletions

View File

@@ -201,12 +201,16 @@ typedef struct button_label_cc
#define CC_WIDTH_MIN CFrameBuffer::getInstance()->scale2Res(16)
#define CC_HEIGHT_MIN CC_WIDTH_MIN
//shadow defines
#define CC_SHADOW_OFF 0x0
#define CC_SHADOW_RIGHT 0x2
#define CC_SHADOW_BOTTOM 0x4
#define CC_SHADOW_CORNER_BOTTOM_LEFT 0x8
#define CC_SHADOW_CORNER_BOTTOM_RIGHT 0x10
#define CC_SHADOW_CORNER_TOP_RIGHT 0x20
//prepared combined shadow defines
#define CC_SHADOW_RIGHT_CORNER_ALL CC_SHADOW_RIGHT | CC_SHADOW_CORNER_BOTTOM_RIGHT | CC_SHADOW_CORNER_TOP_RIGHT
#define CC_SHADOW_BOTTOM_CORNER_ALL CC_SHADOW_BOTTOM | CC_SHADOW_CORNER_BOTTOM_RIGHT | CC_SHADOW_CORNER_BOTTOM_LEFT
#define CC_SHADOW_ON CC_SHADOW_RIGHT | CC_SHADOW_BOTTOM | CC_SHADOW_CORNER_BOTTOM_LEFT | CC_SHADOW_CORNER_BOTTOM_RIGHT | CC_SHADOW_CORNER_TOP_RIGHT
#define CC_SAVE_SCREEN_YES true