Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat(dropdown): add animations on rotary event #7271

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

feat(dropdown): add animations on rotary event #7271

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6714b93
feat(dropdown): add animations on select position
AndreCostaaa Nov 9, 2024
4ba90ec
feat(dropdown): enable dropdown animations on key press events
AndreCostaaa Nov 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions src/widgets/dropdown/lv_dropdown.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ static lv_result_t btn_release_handler(lv_obj_t * obj);
static lv_result_t list_release_handler(lv_obj_t * list_obj);
static void list_press_handler(lv_obj_t * page);
static uint32_t get_id_on_point(lv_obj_t * dropdown_obj, int32_t y);
static void position_to_selected(lv_obj_t * obj);
static void position_to_selected(lv_obj_t * dropdown_obj, lv_anim_enable_t anim_en);
static lv_obj_t * get_label(const lv_obj_t * obj);

/**********************
Expand Down Expand Up @@ -347,7 +347,7 @@ void lv_dropdown_set_selected(lv_obj_t * obj, uint32_t sel_opt)
dropdown->sel_opt_id_orig = dropdown->sel_opt_id;

if(dropdown->list) {
position_to_selected(obj);
position_to_selected(obj, LV_ANIM_OFF);
liamHowatt marked this conversation as resolved.
Show resolved Hide resolved
}

lv_obj_invalidate(obj);
Expand Down Expand Up @@ -576,7 +576,7 @@ void lv_dropdown_open(lv_obj_t * dropdown_obj)
if(list_h > list_fit_h) list_h = list_fit_h;
lv_obj_set_height(dropdown->list, list_h);

position_to_selected(dropdown_obj);
position_to_selected(dropdown_obj, LV_ANIM_OFF);

if(dir == LV_DIR_BOTTOM) lv_obj_align_to(dropdown->list, dropdown_obj, LV_ALIGN_OUT_BOTTOM_LEFT, 0, 0);
else if(dir == LV_DIR_TOP) lv_obj_align_to(dropdown->list, dropdown_obj, LV_ALIGN_OUT_TOP_LEFT, 0, 0);
Expand Down Expand Up @@ -773,7 +773,7 @@ static void lv_dropdown_event(const lv_obj_class_t * class_p, lv_event_t * e)
}
else if(dropdown->sel_opt_id + 1 < dropdown->option_cnt) {
dropdown->sel_opt_id++;
position_to_selected(obj);
position_to_selected(obj, LV_ANIM_ON);
}
}
else if(c == LV_KEY_LEFT || c == LV_KEY_UP) {
Expand All @@ -783,7 +783,7 @@ static void lv_dropdown_event(const lv_obj_class_t * class_p, lv_event_t * e)
}
else if(dropdown->sel_opt_id > 0) {
dropdown->sel_opt_id--;
position_to_selected(obj);
position_to_selected(obj, LV_ANIM_ON);
}
}
else if(c == LV_KEY_ESC) {
Expand All @@ -810,7 +810,7 @@ static void lv_dropdown_event(const lv_obj_class_t * class_p, lv_event_t * e)
new_id = LV_CLAMP(0, new_id, (int32_t)dropdown->option_cnt - 1);

dropdown->sel_opt_id = new_id;
position_to_selected(obj);
position_to_selected(obj, LV_ANIM_ON);
}
}
else if(code == LV_EVENT_DRAW_MAIN) {
Expand Down Expand Up @@ -1198,7 +1198,7 @@ static uint32_t get_id_on_point(lv_obj_t * dropdown_obj, int32_t y)
* Set the position of list when it is closed to show the selected item
* @param ddlist pointer to a drop down list
*/
static void position_to_selected(lv_obj_t * dropdown_obj)
static void position_to_selected(lv_obj_t * dropdown_obj, lv_anim_enable_t anim_en)
{
lv_dropdown_t * dropdown = (lv_dropdown_t *)dropdown_obj;

Expand All @@ -1214,7 +1214,7 @@ static void position_to_selected(lv_obj_t * dropdown_obj)
int32_t line_y1 = dropdown->sel_opt_id * unit_h;

/*Scroll to the selected option*/
lv_obj_scroll_to_y(dropdown->list, line_y1, LV_ANIM_OFF);
lv_obj_scroll_to_y(dropdown->list, line_y1, anim_en);
lv_obj_invalidate(dropdown->list);
}

Expand Down
Loading