1
0
mirror of https://github.com/lvgl/lvgl.git synced 2025-01-28 07:03:00 +08:00

Merge branch 'dev-6.0' into tri

This commit is contained in:
Gabor Kiss-Vamosi 2019-04-17 15:15:23 +02:00
commit 2e0c8ca8f5

View File

@ -424,6 +424,15 @@
#define LV_USE_OBJ_REALIGN 1 #define LV_USE_OBJ_REALIGN 1
#endif #endif
/* Enable to make the object clickable on a larger area.
* LV_EXT_CLICK_AREA_OFF or 0: Disable this feature
* LV_EXT_CLICK_AREA_TINY: The extra area can be adjusted horizontally and vertically (0..255 px)
* LV_EXT_CLICK_AREA_FULL: The extra area can be adjusted in all 4 directions (-32k..+32k px)
*/
#ifndef LV_USE_EXT_CLICK_AREA
#define LV_USE_EXT_CLICK_AREA LV_EXT_CLICK_AREA_OFF
#endif
/*================== /*==================
* LV OBJ X USAGE * LV OBJ X USAGE
*================*/ *================*/
@ -533,6 +542,9 @@
#ifndef LV_LABEL_DEF_SCROLL_SPEED #ifndef LV_LABEL_DEF_SCROLL_SPEED
# define LV_LABEL_DEF_SCROLL_SPEED 25 # define LV_LABEL_DEF_SCROLL_SPEED 25
#endif #endif
#ifndef LV_LABEL_WAIT_CHAR_COUNT
# define LV_LABEL_WAIT_CHAR_COUNT 3 /* Waiting period at beginning/end of animation cycle */
#endif
#endif #endif
/*LED (dependencies: -)*/ /*LED (dependencies: -)*/