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

Remove chechable and toggle

Browse Source
This commit is contained in:
Adam Martini 2020-06-20 17:11:12 -07:00
parent 71f8497ee6
commit fc14c2c01c
2 changed files with 0 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/lv_widgets/lv_rotary.c
View File

@ -85,7 +85,6 @@ lv_obj_t * lv_rotary_create(lv_obj_t * par, const lv_obj_t * copy)
ext->min_value = 0; ext->min_value = 0;
ext->max_value = 0; ext->max_value = 0;
ext->dragging = false; ext->dragging = false;
ext->checkable = 0;
lv_style_list_init(&ext->style_knob); lv_style_list_init(&ext->style_knob);
/*The signal and design functions are not copied so set them here*/ /*The signal and design functions are not copied so set them here*/
@ -108,7 +107,6 @@ lv_obj_t * lv_rotary_create(lv_obj_t * par, const lv_obj_t * copy)
ext->max_value = copy_ext->max_value; ext->max_value = copy_ext->max_value;
ext->dragging = copy_ext->dragging; ext->dragging = copy_ext->dragging;
ext->sym = copy_ext->sym; ext->sym = copy_ext->sym;
ext->checkable = copy_ext->checkable;
lv_style_list_copy(&ext->style_knob, &copy_ext->style_knob); lv_style_list_copy(&ext->style_knob, &copy_ext->style_knob);
lv_obj_refresh_style(rotary, LV_OBJ_PART_ALL); lv_obj_refresh_style(rotary, LV_OBJ_PART_ALL);
@ -193,20 +191,6 @@ void lv_rotary_set_symmetric(lv_obj_t * rotary, bool en)
lv_obj_invalidate(rotary); lv_obj_invalidate(rotary);
} }
/**
* Enable the toggled states
* @param rotary pointer to a button object
* @param tgl true: enable toggled states, false: disable
*/
void lv_rotary_set_checkable(lv_obj_t * rotary, bool tgl)
{
LV_ASSERT_OBJ(rotary, LV_OBJX_NAME);
lv_rotary_ext_t * ext = (lv_rotary_ext_t *)lv_obj_get_ext_attr(rotary);
ext->checkable = tgl != false ? 1 : 0;
}
/*===================== /*=====================
* Getter functions * Getter functions
*====================*/ *====================*/
@ -263,20 +247,6 @@ bool lv_rotary_is_dragged(const lv_obj_t * rotary)
return ext->dragging; return ext->dragging;
} }
/**
* Get the toggle enable attribute of the rotary
* @param rotary pointer to a rotary object
* @return true: toggle enabled, false: disabled
*/
bool lv_rotary_get_checkable(const lv_obj_t * rotary)
{
LV_ASSERT_OBJ(rotary, LV_OBJX_NAME);
lv_rotary_ext_t * ext = (lv_rotary_ext_t *)lv_obj_get_ext_attr(rotary);
return ext->checkable != 0 ? true : false;
}
/********************** /**********************
* STATIC FUNCTIONS * STATIC FUNCTIONS
**********************/ **********************/
@ -334,7 +304,6 @@ static lv_res_t lv_rotary_signal(lv_obj_t * rotary, lv_signal_t sign, void * par
if(res != LV_RES_OK) return res; if(res != LV_RES_OK) return res;
if(sign == LV_SIGNAL_GET_TYPE) return lv_obj_handle_get_type_signal(param, LV_OBJX_NAME); if(sign == LV_SIGNAL_GET_TYPE) return lv_obj_handle_get_type_signal(param, LV_OBJX_NAME);
bool tgl = lv_rotary_get_checkable(rotary);
lv_rotary_ext_t * ext = lv_obj_get_ext_attr(rotary); lv_rotary_ext_t * ext = lv_obj_get_ext_attr(rotary);
lv_point_t p; lv_point_t p;

22
src/lv_widgets/lv_rotary.h
View File

@ -186,13 +186,6 @@ static inline void lv_rotary_set_rotation(lv_obj_t * rotary, uint16_t rotation_a
lv_arc_set_rotation(rotary, rotation_angle); lv_arc_set_rotation(rotary, rotation_angle);
} }
/**
* Enable the toggled states
* @param rotary pointer to a rotary object
* @param tgl true: enable toggled states, false: disable
*/
void lv_rotary_set_checkable(lv_obj_t * rotary, bool tgl);
/** /**
* Set the state of the rotary * Set the state of the rotary
* @param rotary pointer to a rotary object * @param rotary pointer to a rotary object
@ -202,14 +195,6 @@ static inline void lv_rotary_set_state(lv_obj_t * rotary, lv_rotary_state_t stat
lv_btn_set_state(rotary, state); lv_btn_set_state(rotary, state);
} }
/**
* Toggle the state of the rotary (ON->OFF, OFF->ON)
* @param rotary pointer to a rotary object
*/
static inline void lv_rotary_toggle(lv_obj_t * rotary) {
lv_btn_toggle(rotary);
}
/*===================== /*=====================
* Getter functions * Getter functions
*====================*/ *====================*/
@ -299,13 +284,6 @@ static inline lv_btn_state_t lv_rotary_get_state(const lv_obj_t * rotary) {
return lv_btn_get_state(rotary); return lv_btn_get_state(rotary);
} }
/**
* Get the toggle enable attribute of the rotary
* @param rotary pointer to a rotary object
* @return true: toggle enabled, false: disabled
*/
bool lv_rotary_get_checkable(const lv_obj_t * rotary);
/********************** /**********************
* MACROS * MACROS
**********************/ **********************/