diff --git a/CHANGELOG.md b/CHANGELOG.md index eff01b4bb5..4fd054917d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,7 @@ - fix(arc) fix and improve arc dragging - label: Repair calculate back `dot` character logical error which cause infinite loop. - fix(theme_material): remove the bottom border from tabview header +- fix(imgbtn) guess a the closest availabe state with valid src ## v7.7.1 (04.11.2020) ### Bugfixes diff --git a/src/lv_widgets/lv_imgbtn.c b/src/lv_widgets/lv_imgbtn.c index 17a7834098..812f52b062 100644 --- a/src/lv_widgets/lv_imgbtn.c +++ b/src/lv_widgets/lv_imgbtn.c @@ -30,6 +30,7 @@ static lv_design_res_t lv_imgbtn_design(lv_obj_t * imgbtn, const lv_area_t * clip_area, lv_design_mode_t mode); static lv_res_t lv_imgbtn_signal(lv_obj_t * imgbtn, lv_signal_t sign, void * param); static void refr_img(lv_obj_t * imgbtn); +static lv_btn_state_t suggest_state(lv_obj_t * imgbtn, lv_btn_state_t state); /********************** * STATIC VARIABLES @@ -327,7 +328,7 @@ static lv_design_res_t lv_imgbtn_design(lv_obj_t * imgbtn, const lv_area_t * cli /*Just draw an image*/ lv_imgbtn_ext_t * ext = lv_obj_get_ext_attr(imgbtn); - lv_btn_state_t state = lv_imgbtn_get_state(imgbtn); + lv_btn_state_t state = suggest_state(imgbtn, lv_imgbtn_get_state(imgbtn)); /*Simply draw the middle src if no tiled*/ if(!ext->tiled) { @@ -440,7 +441,6 @@ static lv_design_res_t lv_imgbtn_design(lv_obj_t * imgbtn, const lv_area_t * cli draw_dsc.shadow_opa = LV_OPA_TRANSP; lv_obj_init_draw_rect_dsc(imgbtn, LV_OBJ_PART_MAIN, &draw_dsc); - lv_area_t bg_coords; lv_area_copy(&bg_coords, &imgbtn->coords); bg_coords.x1 -= lv_obj_get_style_pad_left(imgbtn, LV_IMGBTN_PART_MAIN); @@ -501,7 +501,7 @@ static lv_res_t lv_imgbtn_signal(lv_obj_t * imgbtn, lv_signal_t sign, void * par static void refr_img(lv_obj_t * imgbtn) { lv_imgbtn_ext_t * ext = lv_obj_get_ext_attr(imgbtn); - lv_btn_state_t state = lv_imgbtn_get_state(imgbtn); + lv_btn_state_t state = suggest_state(imgbtn, lv_imgbtn_get_state(imgbtn)); lv_img_header_t header; const void * src = ext->img_src_mid[state]; @@ -531,4 +531,42 @@ static void refr_img(lv_obj_t * imgbtn) lv_obj_invalidate(imgbtn); } +/** + * If `src` is not defined for the current state try to get a state which is related to the curent but has `src`. + * E.g. if the PRESSED src is not set but the RELEASED does, use the RELEASED. + * @param imgbtn pointer to an image button + * @param state the state to convert + * @return the suggested state + */ +static lv_btn_state_t suggest_state(lv_obj_t * imgbtn, lv_btn_state_t state) +{ + lv_imgbtn_ext_t * ext = lv_obj_get_ext_attr(imgbtn); + if(ext->img_src_mid[state] == NULL) { + switch(state) { + case LV_BTN_STATE_PRESSED: + if(ext->img_src_mid[LV_BTN_STATE_RELEASED]) return LV_BTN_STATE_RELEASED; + break; + case LV_BTN_STATE_CHECKED_RELEASED: + if(ext->img_src_mid[LV_BTN_STATE_RELEASED]) return LV_BTN_STATE_RELEASED; + break; + case LV_BTN_STATE_CHECKED_PRESSED: + if(ext->img_src_mid[LV_BTN_STATE_CHECKED_RELEASED]) return LV_BTN_STATE_CHECKED_RELEASED; + if(ext->img_src_mid[LV_BTN_STATE_PRESSED]) return LV_BTN_STATE_PRESSED; + if(ext->img_src_mid[LV_BTN_STATE_RELEASED]) return LV_BTN_STATE_RELEASED; + break; + case LV_BTN_STATE_DISABLED: + if(ext->img_src_mid[LV_BTN_STATE_RELEASED]) return LV_BTN_STATE_RELEASED; + break; + case LV_BTN_STATE_CHECKED_DISABLED: + if(ext->img_src_mid[LV_BTN_STATE_CHECKED_RELEASED]) return LV_BTN_STATE_CHECKED_RELEASED; + if(ext->img_src_mid[LV_BTN_STATE_RELEASED]) return LV_BTN_STATE_RELEASED; + break; + default: + break; + } + } + + return state; +} + #endif