Embedded/lvgl
1
0
Fork 0
mirror of https://github.com/lvgl/lvgl.git synced 2025-01-14 06:42:58 +08:00
Code Issues Projects Releases Wiki Activity

Update one toggle feature based on review comments

Browse Source
This commit is contained in:
Themba Dube 2019-03-21 13:42:03 -04:00
parent e7b4bef8ac
commit f5aa26f7e1
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/lv_objx/lv_btnm.c
View File

@ -765,6 +765,7 @@ static lv_res_t lv_btnm_signal(lv_obj_t * btnm, lv_signal_t sign, void * param)
} else { } else {
ext->ctrl_bits[ext->btn_id_pr] |= LV_BTNM_CTRL_TGL_STATE; ext->ctrl_bits[ext->btn_id_pr] |= LV_BTNM_CTRL_TGL_STATE;
} }
if(ext->one_toggle)
make_one_button_toggled(btnm, ext->btn_id_pr); make_one_button_toggled(btnm, ext->btn_id_pr);
} }
@ -1069,16 +1070,13 @@ static bool maps_are_identical(const char ** map1, const char ** map2)
*/ */
static void make_one_button_toggled(const lv_obj_t *btnm, uint16_t btn_idx) static void make_one_button_toggled(const lv_obj_t *btnm, uint16_t btn_idx)
{ {
lv_btnm_ext_t * ext = lv_obj_get_ext_attr(btnm); /*Save whether the button was toggled*/
bool was_toggled = lv_btnm_get_btn_ctrl(btnm, btn_idx, LV_BTNM_CTRL_TGL_STATE);
uint16_t i = 0; lv_btnm_set_btn_ctrl_all(btnm, LV_BTNM_CTRL_TGL_STATE, false);
for(i = 0; i < ext->btn_cnt; i++) { if(was_toggled)
if(i != btn_idx) { lv_btnm_set_btn_ctrl(btnm, btn_idx, LV_BTNM_CTRL_TGL_STATE, true);
ext->ctrl_bits[i] &= (~LV_BTNM_CTRL_TGL_STATE);
invalidate_button_area(btnm, i);
}
}
} }
#endif #endif