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

This commit is contained in:
Themba Dube
2019-08-27 17:33:51 -04:00
5 changed files with 6 additions and 4 deletions

View File

@@ -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;
}
/**

View File

@@ -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*/

View File

@@ -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;