Embedded/lvgl
1
0
Fork 0
mirror of https://github.com/lvgl/lvgl.git synced 2025-02-04 07:13:00 +08:00
Code Issues Projects Releases Wiki Activity

Merge branch 'img_decoder' of https://github.com/littlevgl/lvgl into img_decoder

Browse Source
This commit is contained in:
Gabor Kiss-Vamosi 2018-08-20 22:25:40 +02:00
commit 1714caae58
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lv_misc/lv_color.h
View File

@ -57,8 +57,8 @@ extern "C" {
#define LV_OPA_100 255 #define LV_OPA_100 255
#define LV_OPA_COVER 255 #define LV_OPA_COVER 255
#define LV_OPA_MIN 0 /*Opacities below this will be transparent*/ #define LV_OPA_MIN 4 /*Opacities below this will be transparent*/
#define LV_OPA_MAX 255 /*Opacities above this will fully cover*/ #define LV_OPA_MAX 251 /*Opacities above this will fully cover*/
#if LV_COLOR_DEPTH == 1 #if LV_COLOR_DEPTH == 1
#define LV_COLOR_SIZE 8 #define LV_COLOR_SIZE 8

2
lv_objx/lv_btn.c
View File

@ -130,6 +130,8 @@ lv_obj_t * lv_btn_create(lv_obj_t * par, const lv_obj_t * copy)
lv_btn_ext_t * copy_ext = lv_obj_get_ext_attr(copy); lv_btn_ext_t * copy_ext = lv_obj_get_ext_attr(copy);
ext->state = copy_ext->state; ext->state = copy_ext->state;
ext->toggle = copy_ext->toggle; ext->toggle = copy_ext->toggle;
ext->ink_fill_time = copy_ext->ink_fill_time;
ext->ink_wait_time = copy_ext->ink_wait_time;
memcpy(ext->actions, copy_ext->actions, sizeof(ext->actions)); memcpy(ext->actions, copy_ext->actions, sizeof(ext->actions));
memcpy(ext->styles, copy_ext->styles, sizeof(ext->styles)); memcpy(ext->styles, copy_ext->styles, sizeof(ext->styles));