Embedded/lvgl
1
0
Fork 0
mirror of https://github.com/lvgl/lvgl.git synced 2025-02-04 07:13:00 +08:00
Code Issues Projects Releases Wiki Activity

lv_btnm_set_styles support trel, tpr and ina styles (API change)

Browse Source
This commit is contained in:
Gabor 2017-08-24 14:28:02 +02:00
parent 0ef1fa0627
commit 922d0ab150
2 changed files with 22 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
lv_objx/lv_btnm.c
View File

@ -353,14 +353,21 @@ void lv_btnm_set_tgl(lv_obj_t * btnm, bool en, uint16_t id)
/** /**
* Set the styles of the buttons of the button matrix * Set the styles of the buttons of the button matrix
* @param btnm pointer to a button matrix object * @param btnm pointer to a button matrix object
* @param state style in this state (LV_BTN_STATE_PR or LV_BTN_STATE_REL) * @param rel pointer to a style for releases state
* @param style pointer to style * @param pr pointer to a style for pressed state
* @param trel pointer to a style for toggled releases state
* @param tpr pointer to a style for toggled pressed state
* @param ina pointer to a style for inactive state
*/ */
void lv_btnm_set_styles_btn(lv_obj_t * btnm, lv_style_t * rel, lv_style_t * pr) void lv_btnm_set_styles_btn(lv_obj_t * btnm, lv_style_t * rel, lv_style_t * pr,
lv_style_t * trel, lv_style_t * tpr, lv_style_t * ina)
{ {
lv_btnm_ext_t * ext = lv_obj_get_ext(btnm); lv_btnm_ext_t * ext = lv_obj_get_ext(btnm);
ext->style_btn_rel = rel; ext->style_btn_rel = rel;
ext->style_btn_pr = pr; ext->style_btn_pr = pr;
ext->style_btn_trel = trel;
ext->style_btn_tpr = tpr;
ext->style_btn_ina = ina;
lv_obj_inv(btnm); lv_obj_inv(btnm);

18
lv_objx/lv_btnm.h
View File

@ -47,8 +47,9 @@ typedef struct
lv_btnm_callback_t cb; /*A function to call when a button is releases*/ lv_btnm_callback_t cb; /*A function to call when a button is releases*/
lv_style_t * style_btn_rel; /*Style of the released buttons*/ lv_style_t * style_btn_rel; /*Style of the released buttons*/
lv_style_t * style_btn_pr; /*Style of the pressed buttons*/ lv_style_t * style_btn_pr; /*Style of the pressed buttons*/
lv_style_t * style_btn_trel; /*Style of the released buttons*/ lv_style_t * style_btn_trel; /*Style of the toggled released buttons*/
lv_style_t * style_btn_tpr; /*Style of the pressed buttons*/ lv_style_t * style_btn_tpr; /*Style of the toggled pressed buttons*/
lv_style_t * style_btn_ina; /*Style of the inactive buttons*/
uint8_t tgl :1; /*Enable toggling*/ uint8_t tgl :1; /*Enable toggling*/
}lv_btnm_ext_t; }lv_btnm_ext_t;
@ -100,13 +101,18 @@ void lv_btnm_set_action(lv_obj_t * btnm, lv_btnm_callback_t cb);
*/ */
void lv_btnm_set_tgl(lv_obj_t * btnm, bool en, uint16_t id); void lv_btnm_set_tgl(lv_obj_t * btnm, bool en, uint16_t id);
/** /**
* Set the styles of the buttons of the button matrox * Set the styles of the buttons of the button matrix
* @param btnm pointer to a button matrix object * @param btnm pointer to a button matrix object
* @param state style in this state (LV_BTN_STATE_PR or LV_BTN_STATE_REL) * @param rel pointer to a style for releases state
* @param style pointer to style * @param pr pointer to a style for pressed state
* @param trel pointer to a style for toggled releases state
* @param tpr pointer to a style for toggled pressed state
* @param ina pointer to a style for inactive state
*/ */
void lv_btnm_set_styles_btn(lv_obj_t * btnm, lv_style_t * rel, lv_style_t * pr); void lv_btnm_set_styles_btn(lv_obj_t * btnm, lv_style_t * rel, lv_style_t * pr,
lv_style_t * trel, lv_style_t * tpr, lv_style_t * ina)
/** /**
* Get the current map of a button matrix * Get the current map of a button matrix