1
0
mirror of https://github.com/lvgl/lvgl.git synced 2025-01-14 06:42:58 +08:00

Merge branch 'dev-5.3' of https://github.com/littlevgl/lvgl into dev-5.3

This commit is contained in:
Gabor Kiss-Vamosi 2019-01-03 15:51:06 +01:00
commit bbe78633a2
2 changed files with 2 additions and 2 deletions

View File

@ -346,7 +346,7 @@ static lv_res_t lv_spinbox_signal(lv_obj_t * spinbox, lv_signal_t sign, void * p
lv_spinbox_ext_t * ext = lv_obj_get_ext_attr(spinbox);
lv_res_t res;
lv_res_t res = LV_RES_OK;
/* Include the ancient signal function */
if(sign != LV_SIGNAL_CONTROLL)

View File

@ -562,7 +562,7 @@ static bool lv_table_design(lv_obj_t * table, const lv_area_t * mask, lv_design_
lv_point_t txt_size;
lv_area_t cell_area;
lv_area_t txt_area;
lv_txt_flag_t txt_flags;
lv_txt_flag_t txt_flags = LV_TXT_FLAG_NONE;
lv_opa_t opa_scale = lv_obj_get_opa_scale(table);
uint16_t col;