mirror of
https://github.com/lvgl/lvgl.git
synced 2025-01-28 07:03:00 +08:00
lv_sw: simplify animation
This commit is contained in:
Gabor Kiss-Vamosi
parent
65d6c82f81
commit
938819a8b8
174
lv_objx/lv_sw.c
174
lv_objx/lv_sw.c
@ -20,7 +20,6 @@
|
||||
/*********************
|
||||
* DEFINES
|
||||
*********************/
|
||||
|
||||
#define LV_SWITCH_SLIDER_ANIM_MAX 1000
|
||||
|
||||
/**********************
|
||||
@ -31,6 +30,7 @@
|
||||
* STATIC PROTOTYPES
|
||||
**********************/
|
||||
static lv_res_t lv_sw_signal(lv_obj_t * sw, lv_signal_t sign, void * param);
|
||||
static void lv_sw_anim_to_value(lv_obj_t * sw, int16_t value);
|
||||
|
||||
/**********************
|
||||
* STATIC VARIABLES
|
||||
@ -68,7 +68,7 @@ lv_obj_t * lv_sw_create(lv_obj_t * par, const lv_obj_t * copy)
|
||||
if(ext == NULL) return NULL;
|
||||
|
||||
/*Initialize the allocated 'ext' */
|
||||
ext->changed = 0;
|
||||
ext->tmp_state = 0;
|
||||
ext->anim_time = 0;
|
||||
ext->style_knob_off = ext->slider.style_knob;
|
||||
ext->style_knob_on = ext->slider.style_knob;
|
||||
@ -81,6 +81,7 @@ lv_obj_t * lv_sw_create(lv_obj_t * par, const lv_obj_t * copy)
|
||||
lv_slider_set_range(new_sw, 0, 1);
|
||||
lv_obj_set_size(new_sw, 2 * LV_DPI / 3, LV_DPI / 3);
|
||||
lv_slider_set_knob_in(new_sw, true);
|
||||
lv_slider_set_range(new_sw, 0, LV_SWITCH_SLIDER_ANIM_MAX);
|
||||
|
||||
/*Set the default styles*/
|
||||
lv_theme_t * th = lv_theme_get_current();
|
||||
@ -115,44 +116,17 @@ lv_obj_t * lv_sw_create(lv_obj_t * par, const lv_obj_t * copy)
|
||||
* Setter functions
|
||||
*====================*/
|
||||
|
||||
static void lv_sw_clear_anim(lv_obj_t *sw)
|
||||
{
|
||||
lv_sw_ext_t * ext = lv_obj_get_ext_attr(sw);
|
||||
ext->anim_act = 0;
|
||||
}
|
||||
|
||||
/**
|
||||
* Turn ON the switch
|
||||
* @param sw pointer to a switch object
|
||||
*/
|
||||
void lv_sw_on(lv_obj_t * sw)
|
||||
{
|
||||
if(lv_sw_get_state(sw)) return; /*Do nothing is already turned on*/
|
||||
|
||||
lv_sw_ext_t * ext = lv_obj_get_ext_attr(sw);
|
||||
#if USE_LV_ANIMATION
|
||||
if(lv_sw_get_anim_time(sw) > 0) {
|
||||
if(ext->anim_act) {
|
||||
lv_anim_del(sw, NULL);
|
||||
ext->anim_act = 0;
|
||||
}
|
||||
ext->cur_anim.var = sw;
|
||||
ext->cur_anim.start = lv_slider_get_value(sw);
|
||||
ext->cur_anim.end = LV_SWITCH_SLIDER_ANIM_MAX;
|
||||
ext->cur_anim.fp = (lv_anim_fp_t)lv_slider_set_value;
|
||||
ext->cur_anim.path = lv_anim_path_linear;
|
||||
ext->cur_anim.end_cb = (lv_anim_cb_t)lv_sw_clear_anim;
|
||||
ext->cur_anim.act_time = 0;
|
||||
ext->cur_anim.time = lv_sw_get_anim_time(sw);
|
||||
ext->cur_anim.playback = 0;
|
||||
ext->cur_anim.playback_pause = 0;
|
||||
ext->cur_anim.repeat = 0;
|
||||
ext->cur_anim.repeat_pause = 0;
|
||||
ext->anim_act = 1;
|
||||
lv_anim_create(&ext->cur_anim);
|
||||
} else /* continues below if statement */
|
||||
#endif
|
||||
lv_slider_set_value(sw, 1);
|
||||
|
||||
if(lv_sw_get_anim_time(sw) > 0) lv_sw_anim_to_value(sw, LV_SWITCH_SLIDER_ANIM_MAX);
|
||||
else lv_slider_set_value(sw, LV_SWITCH_SLIDER_ANIM_MAX);
|
||||
|
||||
lv_slider_set_style(sw, LV_SLIDER_STYLE_KNOB, ext->style_knob_on);
|
||||
}
|
||||
|
||||
@ -162,32 +136,10 @@ void lv_sw_on(lv_obj_t * sw)
|
||||
*/
|
||||
void lv_sw_off(lv_obj_t * sw)
|
||||
{
|
||||
if(!lv_sw_get_state(sw)) return; /*Do nothing is already turned off*/
|
||||
|
||||
lv_sw_ext_t * ext = lv_obj_get_ext_attr(sw);
|
||||
#if USE_LV_ANIMATION
|
||||
if(lv_sw_get_anim_time(sw) > 0) {
|
||||
if(ext->anim_act) {
|
||||
lv_anim_del(sw, NULL);
|
||||
ext->anim_act = 0;
|
||||
}
|
||||
ext->cur_anim.var = sw;
|
||||
ext->cur_anim.start = LV_SWITCH_SLIDER_ANIM_MAX;
|
||||
ext->cur_anim.end = 0;
|
||||
ext->cur_anim.fp = (lv_anim_fp_t)lv_slider_set_value;
|
||||
ext->cur_anim.path = lv_anim_path_linear;
|
||||
ext->cur_anim.end_cb = (lv_anim_cb_t)lv_sw_clear_anim;
|
||||
ext->cur_anim.act_time = 0;
|
||||
ext->cur_anim.time = lv_sw_get_anim_time(sw);
|
||||
ext->cur_anim.playback = 0;
|
||||
ext->cur_anim.playback_pause = 0;
|
||||
ext->cur_anim.repeat = 0;
|
||||
ext->cur_anim.repeat_pause = 0;
|
||||
ext->anim_act = 1;
|
||||
lv_anim_create(&ext->cur_anim);
|
||||
} else /* continues below if statement */
|
||||
#endif
|
||||
lv_slider_set_value(sw, 0);
|
||||
if(lv_sw_get_anim_time(sw) > 0) lv_sw_anim_to_value(sw, 0);
|
||||
else lv_slider_set_value(sw, 0);
|
||||
|
||||
lv_slider_set_style(sw, LV_SLIDER_STYLE_KNOB, ext->style_knob_off);
|
||||
}
|
||||
|
||||
@ -219,20 +171,14 @@ void lv_sw_set_style(lv_obj_t * sw, lv_sw_style_t type, lv_style_t * style)
|
||||
}
|
||||
}
|
||||
|
||||
#if USE_LV_ANIMATION
|
||||
void lv_sw_set_anim_time(lv_obj_t *sw, uint16_t anim_time)
|
||||
{
|
||||
lv_sw_ext_t * ext = lv_obj_get_ext_attr(sw);
|
||||
bool sw_state = lv_sw_get_state(sw);
|
||||
uint16_t max = anim_time > 0 ? LV_SWITCH_SLIDER_ANIM_MAX : 1;
|
||||
ext->anim_time = anim_time;
|
||||
if(anim_time > 0) {
|
||||
lv_slider_set_range(sw, 0, LV_SWITCH_SLIDER_ANIM_MAX);
|
||||
} else
|
||||
lv_slider_set_range(sw, 0, 1);
|
||||
lv_slider_set_value(sw, sw_state ? max : 0);
|
||||
}
|
||||
#if USE_LV_ANIMATION == 0
|
||||
anim_time = 0;
|
||||
#endif
|
||||
lv_sw_ext_t * ext = lv_obj_get_ext_attr(sw);
|
||||
ext->anim_time = anim_time;
|
||||
}
|
||||
|
||||
/*=====================
|
||||
* Getter functions
|
||||
@ -270,13 +216,16 @@ lv_style_t * lv_sw_get_style(const lv_obj_t * sw, lv_sw_style_t type)
|
||||
return style;
|
||||
}
|
||||
|
||||
#if USE_LV_ANIMATION
|
||||
uint16_t lv_sw_get_anim_time(const lv_obj_t *sw)
|
||||
{
|
||||
|
||||
#if USE_LV_ANIMATION
|
||||
lv_sw_ext_t * ext = lv_obj_get_ext_attr(sw);
|
||||
return ext->anim_time;
|
||||
}
|
||||
#else
|
||||
return 0;
|
||||
#endif
|
||||
}
|
||||
|
||||
/**********************
|
||||
* STATIC FUNCTIONS
|
||||
@ -299,13 +248,6 @@ static lv_res_t lv_sw_signal(lv_obj_t * sw, lv_signal_t sign, void * param)
|
||||
if(sign == LV_SIGNAL_PRESSING) old_val = ext->slider.drag_value;
|
||||
else old_val = lv_slider_get_value(sw);
|
||||
|
||||
#if USE_LV_ANIMATION
|
||||
if(lv_sw_get_anim_time(sw) > 0) {
|
||||
/* Overwrite old_val */
|
||||
old_val = lv_sw_get_state(sw) ? LV_SWITCH_SLIDER_ANIM_MAX : 0;
|
||||
}
|
||||
#endif
|
||||
|
||||
/*Do not let the slider to call the callback. The Switch will do it if required*/
|
||||
lv_action_t slider_action = ext->slider.action;
|
||||
ext->slider.action = NULL;
|
||||
@ -317,52 +259,24 @@ static lv_res_t lv_sw_signal(lv_obj_t * sw, lv_signal_t sign, void * param)
|
||||
|
||||
if(sign == LV_SIGNAL_CLEANUP) {
|
||||
/*Nothing to cleanup. (No dynamically allocated memory in 'ext')*/
|
||||
} else if(sign == LV_SIGNAL_PRESSING) {
|
||||
int16_t act_val = ext->slider.drag_value;
|
||||
if(act_val != old_val) ext->changed = 1;
|
||||
#if USE_LV_ANIMATION
|
||||
if(lv_sw_get_anim_time(sw) > 0) {
|
||||
/* Keep forcing the slider to old_val */
|
||||
lv_slider_set_value(sw, old_val);
|
||||
ext->slider.drag_value = old_val;
|
||||
}
|
||||
#endif
|
||||
} else if(sign == LV_SIGNAL_PRESS_LOST) {
|
||||
ext->changed = 0;
|
||||
}
|
||||
else if(sign == LV_SIGNAL_PRESSED) {
|
||||
ext->tmp_state = lv_sw_get_state(sw);
|
||||
}
|
||||
else if(sign == LV_SIGNAL_PRESS_LOST) {
|
||||
if(lv_sw_get_state(sw)) lv_slider_set_style(sw, LV_SLIDER_STYLE_KNOB, ext->style_knob_on);
|
||||
else lv_slider_set_style(sw, LV_SLIDER_STYLE_KNOB, ext->style_knob_off);
|
||||
#if USE_LV_ANIMATION
|
||||
if(lv_sw_get_anim_time(sw) > 0) {
|
||||
/* Keep forcing the slider to old_val */
|
||||
lv_slider_set_value(sw, old_val);
|
||||
ext->slider.drag_value = old_val;
|
||||
}
|
||||
else if(sign == LV_SIGNAL_RELEASED) {
|
||||
int16_t v = lv_slider_get_value(sw);
|
||||
if(v > LV_SWITCH_SLIDER_ANIM_MAX / 2) {
|
||||
lv_sw_on(sw);
|
||||
if(ext->tmp_state == 0 && slider_action != NULL) res = slider_action(sw);
|
||||
}
|
||||
#endif
|
||||
} else if(sign == LV_SIGNAL_RELEASED) {
|
||||
if(ext->changed == 0) {
|
||||
int16_t v = lv_slider_get_value(sw);
|
||||
if(v == 0) lv_slider_set_value(sw, 1);
|
||||
else lv_slider_set_value(sw, 0);
|
||||
else {
|
||||
lv_sw_off(sw);
|
||||
if(ext->tmp_state && slider_action != NULL) res = slider_action(sw);
|
||||
}
|
||||
#if USE_LV_ANIMATION
|
||||
else if(lv_sw_get_anim_time(sw) > 0) {
|
||||
if(old_val == 0) {
|
||||
lv_slider_set_value(sw, 0);
|
||||
lv_bar_set_value(sw, 0);
|
||||
lv_sw_on(sw);
|
||||
} else {
|
||||
lv_slider_set_value(sw, LV_SWITCH_SLIDER_ANIM_MAX);
|
||||
lv_sw_off(sw);
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
if(lv_sw_get_state(sw)) lv_slider_set_style(sw, LV_SLIDER_STYLE_KNOB, ext->style_knob_on);
|
||||
else lv_slider_set_style(sw, LV_SLIDER_STYLE_KNOB, ext->style_knob_off);
|
||||
|
||||
ext->changed = 0;
|
||||
|
||||
if(slider_action != NULL) res = slider_action(sw);
|
||||
|
||||
} else if(sign == LV_SIGNAL_CONTROLL) {
|
||||
|
||||
@ -397,4 +311,24 @@ static lv_res_t lv_sw_signal(lv_obj_t * sw, lv_signal_t sign, void * param)
|
||||
return res;
|
||||
}
|
||||
|
||||
|
||||
static void lv_sw_anim_to_value(lv_obj_t * sw, int16_t value)
|
||||
{
|
||||
lv_anim_t a;
|
||||
lv_sw_ext_t * ext = lv_obj_get_ext_attr(sw);
|
||||
a.var = sw;
|
||||
a.start = ext->slider.bar.cur_value;
|
||||
a.end = value;
|
||||
a.fp = (lv_anim_fp_t)lv_slider_set_value;
|
||||
a.path = lv_anim_path_linear;
|
||||
a.end_cb = NULL;
|
||||
a.act_time = 0;
|
||||
a.time = lv_sw_get_anim_time(sw);
|
||||
a.playback = 0;
|
||||
a.playback_pause = 0;
|
||||
a.repeat = 0;
|
||||
a.repeat_pause = 0;
|
||||
lv_anim_create(&a);
|
||||
}
|
||||
|
||||
#endif
|
||||
|
||||
@ -41,13 +41,11 @@ typedef struct
|
||||
{
|
||||
lv_slider_ext_t slider; /*Ext. of ancestor*/
|
||||
/*New data for this type */
|
||||
lv_style_t *style_knob_off; /*Style of the knob when the switch is OFF*/
|
||||
lv_style_t *style_knob_on; /*Style of the knob when the switch is ON (NULL to use the same as OFF)*/
|
||||
uint8_t changed :1; /*Indicates the switch explicitly changed by drag*/
|
||||
lv_style_t *style_knob_off; /*Style of the knob when the switch is OFF*/
|
||||
lv_style_t *style_knob_on; /*Style of the knob when the switch is ON (NULL to use the same as OFF)*/
|
||||
uint8_t tmp_state :1; /*Saves the initial state of the switch when it begins to drag*/
|
||||
#if USE_LV_ANIMATION
|
||||
uint16_t anim_time; /*switch animation time */
|
||||
lv_anim_t cur_anim; /*current active animation */
|
||||
uint8_t anim_act :1;
|
||||
#endif
|
||||
} lv_sw_ext_t;
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user