github-code/lvgl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into dev-7.0

Browse Source
This commit is contained in:
Themba Dube
2019-12-31 19:23:21 -05:00
parent d80d03ef83 479012eb48
commit 4432a3d31f
3 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/lv_core/lv_obj.c
View File

@@ -1504,6 +1504,10 @@ lv_res_t lv_event_send(lv_obj_t * obj, lv_event_t event, const void * data)
*/ */
lv_res_t lv_event_send_func(lv_event_cb_t event_xcb, lv_obj_t * obj, lv_event_t event, const void * data) lv_res_t lv_event_send_func(lv_event_cb_t event_xcb, lv_obj_t * obj, lv_event_t event, const void * data)
{ {
if(obj != NULL) {
LV_ASSERT_OBJ(obj, LV_OBJX_NAME);
}
/* Build a simple linked list from the objects used in the events /* Build a simple linked list from the objects used in the events
* It's important to know if an this object was deleted by a nested event * It's important to know if an this object was deleted by a nested event
* called from this `even_cb`. */ * called from this `even_cb`. */

7
src/lv_objx/lv_btnm.c
View File

@@ -864,9 +864,10 @@ static lv_res_t lv_btnm_signal(lv_obj_t * btnm, lv_signal_t sign, void * param)
lv_indev_type_t indev_type = lv_indev_get_type(indev); lv_indev_type_t indev_type = lv_indev_get_type(indev);
/*If not focused by an input device assume the last input device*/ /*If not focused by an input device assume the last input device*/
if(indev_type == LV_INDEV_TYPE_NONE) { if(indev == NULL) {
indev_type = lv_indev_get_type(lv_indev_get_next(NULL)); indev = lv_indev_get_next(NULL);
} indev_type = lv_indev_get_type(indev);
}
if(indev_type == LV_INDEV_TYPE_POINTER) { if(indev_type == LV_INDEV_TYPE_POINTER) {
/*Select the clicked button*/ /*Select the clicked button*/

3
src/lv_objx/lv_img.c
View File

@@ -502,6 +502,9 @@ static lv_design_res_t lv_img_design(lv_obj_t * img, const lv_area_t * clip_area
cover = lv_area_is_in(clip_area, &img->coords) ? LV_DESIGN_RES_COVER : LV_DESIGN_RES_NOT_COVER; cover = lv_area_is_in(clip_area, &img->coords) ? LV_DESIGN_RES_COVER : LV_DESIGN_RES_NOT_COVER;
} }
const lv_style_t * style = lv_img_get_style(img, LV_IMG_STYLE_MAIN);
if(style->image.opa < LV_OPA_MAX) return false;
return cover; return cover;
} else if(mode == LV_DESIGN_DRAW_MAIN) { } else if(mode == LV_DESIGN_DRAW_MAIN) {
if(ext->h == 0 || ext->w == 0) return true; if(ext->h == 0 || ext->w == 0) return true;