From 941409f3f9ef30b75690abd2347f1468914c732d Mon Sep 17 00:00:00 2001 From: seyyah Date: Mon, 19 Aug 2019 16:24:06 +0300 Subject: [PATCH 1/5] docs/CODING_STYLE.md: add src prefix to path (#1174) --- docs/CODING_STYLE.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/CODING_STYLE.md b/docs/CODING_STYLE.md index b8bb841db..31071e94f 100644 --- a/docs/CODING_STYLE.md +++ b/docs/CODING_STYLE.md @@ -1,6 +1,6 @@ ## File format -Use [lv_misc/lv_templ.c](https://github.com/littlevgl/lvgl/blob/master/lv_misc/lv_templ.c) and [lv_misc/lv_templ.h](https://github.com/littlevgl/lvgl/blob/master/lv_misc/lv_templ.h) +Use [lv_misc/lv_templ.c](https://github.com/littlevgl/lvgl/blob/master/src/lv_misc/lv_templ.c) and [lv_misc/lv_templ.h](https://github.com/littlevgl/lvgl/blob/master/src/lv_misc/lv_templ.h) ## Naming conventions * Words are separated by '_' From 94c95bc9e461847a734a5bde9818fa837d343425 Mon Sep 17 00:00:00 2001 From: embeddedt <42941056+embeddedt@users.noreply.github.com> Date: Wed, 21 Aug 2019 09:53:55 -0400 Subject: [PATCH 2/5] lv_table: fix memory leak when deleted (#1178) --- src/lv_objx/lv_table.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/lv_objx/lv_table.c b/src/lv_objx/lv_table.c index f3c6bfab6..ec8ebe5b8 100644 --- a/src/lv_objx/lv_table.c +++ b/src/lv_objx/lv_table.c @@ -752,6 +752,8 @@ static lv_res_t lv_table_signal(lv_obj_t * table, lv_signal_t sign, void * param ext->cell_data[cell] = NULL; } } + if(ext->cell_data != NULL) + lv_mem_free(ext->cell_data); } else if(sign == LV_SIGNAL_GET_TYPE) { lv_obj_type_t * buf = param; uint8_t i; From 248c3a51ea605ca7b7b7e92c21ac09d02017c211 Mon Sep 17 00:00:00 2001 From: Gabor Kiss-Vamosi Date: Sat, 24 Aug 2019 10:15:09 +0200 Subject: [PATCH 3/5] btnm: fix padding.bottom handling --- src/lv_objx/lv_btnm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lv_objx/lv_btnm.c b/src/lv_objx/lv_btnm.c index 912986245..f9b83b6cf 100644 --- a/src/lv_objx/lv_btnm.c +++ b/src/lv_objx/lv_btnm.c @@ -201,7 +201,7 @@ void lv_btnm_set_map(const lv_obj_t * btnm, const char * map[]) /*Make sure the last row is at the bottom of 'btnm'*/ if(map_p_tmp[btn_cnt][0] == '\0') { /*Last row?*/ - btn_h = max_h - act_y + style_bg->body.padding.bottom - 1; + btn_h = lv_obj_get_height(btnm)- act_y - style_bg->body.padding.bottom - 1; } /*Only deal with the non empty lines*/ From c0180b05b47443c7fdeb7d982dff05561fb30f11 Mon Sep 17 00:00:00 2001 From: Harry Jiang Date: Mon, 26 Aug 2019 13:26:49 +0800 Subject: [PATCH 4/5] Fix the read input device example in README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 3cf978f44..a90532560 100644 --- a/README.md +++ b/README.md @@ -144,7 +144,7 @@ indev_drv.type = LV_INDEV_TYPE_POINTER; /*Touch pad is a pointer-like device* indev_drv.read_cb = my_touchpad_read; /*Set your driver function*/ lv_indev_drv_register(&indev_drv); /*Finally register the driver*/ -bool my_touchpad_read(lv_indev_t * indev, lv_indev_data_t * data) +bool my_touchpad_read(lv_indev_drv_t * indev_driver, lv_indev_data_t * data) { static lv_coord_t last_x = 0; static lv_coord_t last_y = 0; From 3eb06252e9f1ec2e6e24938b7d6e7fbc6dbd4aaf Mon Sep 17 00:00:00 2001 From: Gabor Kiss-Vamosi Date: Mon, 26 Aug 2019 09:05:30 +0200 Subject: [PATCH 5/5] indev: fix lv_indev_enable --- src/lv_core/lv_indev.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lv_core/lv_indev.c b/src/lv_core/lv_indev.c index 2d672ac44..6ec59bdac 100644 --- a/src/lv_core/lv_indev.c +++ b/src/lv_core/lv_indev.c @@ -182,7 +182,7 @@ void lv_indev_enable(lv_indev_t * indev, bool en) { if(!indev) return; - indev->proc.disabled = en ? 1 : 0; + indev->proc.disabled = en ? 0 : 1; } /**