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

rotary: clean up

Browse Source
This commit is contained in:
Gabor Kiss-Vamosi 2020-06-19 23:25:17 +02:00
parent 94a710a5e1
commit 95b07a2d23
2 changed files with 15 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
src/lv_widgets/lv_rotary.c
View File

@ -86,10 +86,7 @@ lv_obj_t * lv_rotary_create(lv_obj_t * par, const lv_obj_t * copy)
ext->cur_value = 0; ext->cur_value = 0;
ext->min_value = 0; ext->min_value = 0;
ext->max_value = 0; ext->max_value = 0;
ext->start_value = 0;
ext->dragging = false; ext->dragging = false;
lv_style_list_init(&ext->style_bg);
lv_style_list_init(&ext->style_indic);
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*/
@ -111,10 +108,7 @@ lv_obj_t * lv_rotary_create(lv_obj_t * par, const lv_obj_t * copy)
ext->cur_value = copy_ext->cur_value; ext->cur_value = copy_ext->cur_value;
ext->min_value = copy_ext->min_value; ext->min_value = copy_ext->min_value;
ext->max_value = copy_ext->max_value; ext->max_value = copy_ext->max_value;
ext->start_value = copy_ext->start_value;
ext->dragging = copy_ext->dragging; ext->dragging = copy_ext->dragging;
lv_style_list_copy(&ext->style_bg, &copy_ext->style_bg);
lv_style_list_copy(&ext->style_indic, &copy_ext->style_indic);
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);
@ -162,20 +156,6 @@ void lv_rotary_set_value(lv_obj_t * rotary, int16_t value, lv_anim_enable_t anim
); );
} }
/**
* Set a new value for the left knob of a rotary
* @param rotary pointer to a rotary object
* @param left_value new value
* @param anim LV_ANIM_ON: set the value with an animation; LV_ANIM_OFF: change the value immediately
*/
void lv_rotary_set_start_value(lv_obj_t * rotary, int16_t value, lv_anim_enable_t anim)
{
LV_ASSERT_OBJ(rotary, LV_OBJX_NAME);
lv_rotary_ext_t * ext = (lv_rotary_ext_t *)lv_obj_get_ext_attr(rotary);
ext->start_value = value;
}
/** /**
* Set minimum and the maximum values of a rotary * Set minimum and the maximum values of a rotary
* @param rotary pointer to the rotary object * @param rotary pointer to the rotary object
@ -208,12 +188,12 @@ void lv_rotary_set_range(lv_obj_t * rotary, int16_t min, int16_t max)
* @param rotary pointer to a rotary object * @param rotary pointer to a rotary object
* @param en true: enable disable symmetric behavior; false: disable * @param en true: enable disable symmetric behavior; false: disable
*/ */
void lv_rotary_set_type(lv_obj_t * rotary, lv_rotary_type_t type) void lv_rotary_set_symmetric(lv_obj_t * rotary, bool en)
{ {
LV_ASSERT_OBJ(rotary, LV_OBJX_NAME); LV_ASSERT_OBJ(rotary, LV_OBJX_NAME);
lv_rotary_ext_t *ext = (lv_rotary_ext_t *)lv_obj_get_ext_attr(rotary); lv_rotary_ext_t *ext = (lv_rotary_ext_t *)lv_obj_get_ext_attr(rotary);
ext->type = type; ext->sym = en;
lv_obj_invalidate(rotary); lv_obj_invalidate(rotary);
} }
@ -235,19 +215,6 @@ int16_t lv_rotary_get_value(const lv_obj_t * rotary)
return ext->cur_value; return ext->cur_value;
} }
/**
* Get the value of the left knob of a rotary
* @param rotary pointer to a rotary object
* @return the start value of the rotary
*/
int16_t lv_rotary_get_start_value(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->start_value;
}
/** /**
* Get the minimum value of a rotary * Get the minimum value of a rotary
* @param rotary pointer to a rotary object * @param rotary pointer to a rotary object
@ -349,9 +316,6 @@ static lv_res_t lv_rotary_signal(lv_obj_t * rotary, lv_signal_t sign, void * par
if(sign == LV_SIGNAL_PRESSED) { if(sign == LV_SIGNAL_PRESSED) {
ext->dragging = true; ext->dragging = true;
if(lv_rotary_get_type(rotary) == LV_ROTARY_TYPE_NORMAL) {
ext->value_to_set = &ext->cur_value;
}
} }
else if(sign == LV_SIGNAL_PRESSING && ext->value_to_set != NULL) { else if(sign == LV_SIGNAL_PRESSING && ext->value_to_set != NULL) {
lv_indev_get_point(param, &p); lv_indev_get_point(param, &p);
@ -408,10 +372,10 @@ static lv_style_list_t * lv_rotary_get_style(lv_obj_t * rotary, uint8_t part)
switch(part) { switch(part) {
case LV_ROTARY_PART_BG: case LV_ROTARY_PART_BG:
style_dsc_p = &ext->style_bg; style_dsc_p = lv_obj_get_style_list(rotary, LV_ARC_PART_BG);
break; break;
case LV_ROTARY_PART_INDIC: case LV_ROTARY_PART_INDIC:
style_dsc_p = &ext->style_indic; style_dsc_p = lv_obj_get_style_list(rotary, LV_ARC_PART_INDIC);
break; break;
case LV_ROTARY_PART_KNOB: case LV_ROTARY_PART_KNOB:
style_dsc_p = &ext->style_knob; style_dsc_p = &ext->style_knob;
@ -425,10 +389,6 @@ static lv_style_list_t * lv_rotary_get_style(lv_obj_t * rotary, uint8_t part)
static void draw_knob(lv_obj_t * rotary, const lv_area_t * clip_area) static void draw_knob(lv_obj_t * rotary, const lv_area_t * clip_area)
{ {
lv_bidi_dir_t base_dir = lv_obj_get_base_dir(rotary);
lv_rotary_ext_t *ext = (lv_rotary_ext_t *)lv_obj_get_ext_attr(rotary);
lv_coord_t left_bg = lv_obj_get_style_pad_left(rotary, LV_ROTARY_PART_BG); lv_coord_t left_bg = lv_obj_get_style_pad_left(rotary, LV_ROTARY_PART_BG);
lv_coord_t right_bg = lv_obj_get_style_pad_right(rotary, LV_ROTARY_PART_BG); lv_coord_t right_bg = lv_obj_get_style_pad_right(rotary, LV_ROTARY_PART_BG);
lv_coord_t top_bg = lv_obj_get_style_pad_top(rotary, LV_ROTARY_PART_BG); lv_coord_t top_bg = lv_obj_get_style_pad_top(rotary, LV_ROTARY_PART_BG);

41
src/lv_widgets/lv_rotary.h
View File

@ -50,24 +50,21 @@ typedef struct {
/*Ext. of ancestor*/ /*Ext. of ancestor*/
lv_arc_ext_t arc; lv_arc_ext_t arc;
/*New data for this type*/ /*New data for this type*/
lv_btn_ext_t btn;
lv_rotary_type_t type;
lv_style_list_t style_bg; /* Style of the background */
lv_style_list_t style_indic; /* Style of the indicator */
lv_style_list_t style_knob; /* Style of the knob */ lv_style_list_t style_knob; /* Style of the knob */
int16_t cur_value; /*Current value of the rotary*/ int16_t cur_value; /*Current value of the rotary*/
int16_t min_value; /*Minimum value of the rotary*/ int16_t min_value; /*Minimum value of the rotary*/
int16_t max_value; /*Maximum value of the rotary*/ int16_t max_value; /*Maximum value of the rotary*/
int16_t start_value; /*Start value of the rotary*/ int16_t * value_to_set; /*Start value of the rotary*/
int16_t value_to_set; /*Start value of the rotary*/ uint16_t dragging :1;
bool dragging; uint16_t sym :1;
} lv_rotary_ext_t; } lv_rotary_ext_t;
/** Built-in styles of rotary*/ /** Built-in styles of rotary*/
enum { enum {
LV_ROTARY_PART_BG, /** Rotary background style. */ LV_ROTARY_PART_BG = LV_ARC_PART_BG, /** Rotary background style. */
LV_ROTARY_PART_INDIC, /** Rotary indicator (filled area) style. */ LV_ROTARY_PART_INDIC = LV_ARC_PART_INDIC, /** Rotary indicator (filled area) style. */
LV_ROTARY_PART_KNOB, /** Rotary knob style. */ LV_ROTARY_PART_KNOB = _LV_ARC_PART_VIRTUAL_LAST, /** Rotary knob style. */
_LV_ROTARY_PART_VIRTUAL_LAST
}; };
/********************** /**********************
@ -94,14 +91,6 @@ lv_obj_t * lv_rotary_create(lv_obj_t * par, const lv_obj_t * copy);
*/ */
void lv_rotary_set_value(lv_obj_t * rotary, int16_t value, lv_anim_enable_t anim); void lv_rotary_set_value(lv_obj_t * rotary, int16_t value, lv_anim_enable_t anim);
/**
* Set a new value for the left knob of a rotary
* @param rotary pointer to a rotary object
* @param left_value new value
* @param anim LV_ANIM_ON: set the value with an animation; LV_ANIM_OFF: change the value immediately
*/
void lv_rotary_set_start_value(lv_obj_t * rotary, int16_t value, lv_anim_enable_t anim);
/** /**
* Set minimum and the maximum values of a rotary * Set minimum and the maximum values of a rotary
* @param rotary pointer to the rotary object * @param rotary pointer to the rotary object
@ -116,7 +105,7 @@ void lv_rotary_set_range(lv_obj_t * rotary, int16_t min, int16_t max);
* @param rotary pointer to a rotary object * @param rotary pointer to a rotary object
* @param en true: enable disable symmetric behavior; false: disable * @param en true: enable disable symmetric behavior; false: disable
*/ */
void lv_rotary_set_type(lv_obj_t * rotary, lv_rotary_type_t type); void lv_rotary_set_symmetric(lv_obj_t * rotary, bool en);
/** /**
* Set the start angle of rotary indicator. 0 deg: right, 90 bottom, etc. * Set the start angle of rotary indicator. 0 deg: right, 90 bottom, etc.
@ -230,13 +219,6 @@ static inline uint16_t lv_rotary_get_bg_angle_end(lv_obj_t * rotary) {
*/ */
int16_t lv_rotary_get_value(const lv_obj_t * rotary); int16_t lv_rotary_get_value(const lv_obj_t * rotary);
/**
* Get the value of the left knob of a rotary
* @param rotary pointer to a rotary object
* @return the start value of the rotary
*/
int16_t lv_rotary_get_start_value(const lv_obj_t * rotary);
/** /**
* Get the minimum value of a rotary * Get the minimum value of a rotary
* @param rotary pointer to a rotary object * @param rotary pointer to a rotary object
@ -263,11 +245,10 @@ bool lv_rotary_is_dragged(const lv_obj_t * rotary);
* @param rotary pointer to a rotary object * @param rotary pointer to a rotary object
* @return true: symmetric is enabled; false: disable * @return true: symmetric is enabled; false: disable
*/ */
static inline lv_rotary_type_t lv_rotary_get_type(lv_obj_t * rotary) static inline bool lv_rotary_get_symmetric(lv_obj_t * rotary)
{ {
lv_rotary_type_t type = lv_rotary_get_type(rotary); lv_rotary_ext_t * ext = lv_obj_get_ext_attr(rotary);
if(type == LV_ROTARY_TYPE_NORMAL) return ext->sym;
return LV_ROTARY_TYPE_NORMAL;
} }
/********************** /**********************