diff options
Diffstat (limited to 'src')
26 files changed, 69 insertions, 64 deletions
diff --git a/src/core/lv_obj.c b/src/core/lv_obj.c index c06aa0669..0448607f4 100644 --- a/src/core/lv_obj.c +++ b/src/core/lv_obj.c @@ -636,7 +636,7 @@ static void lv_obj_event(const lv_obj_class_t * class_p, lv_event_t * e) /* Use the indev for then indev handler. * But if the obj was focused manually it returns NULL so try to * use the indev from the event*/ - lv_indev_t * indev = lv_indev_get_act(); + lv_indev_t * indev = lv_indev_active(); if(indev == NULL) indev = lv_event_get_indev(e); lv_indev_type_t indev_type = lv_indev_get_type(indev); diff --git a/src/core/lv_obj_event.c b/src/core/lv_obj_event.c index 1df77ce2b..4e236a7a6 100644 --- a/src/core/lv_obj_event.c +++ b/src/core/lv_obj_event.c @@ -307,7 +307,7 @@ static lv_result_t event_send_core(lv_event_t * e) LV_TRACE_EVENT("Sending event %d to %p with %p param", e->code, (void *)e->original_target, e->param); /*Call the input device's feedback callback if set*/ - lv_indev_t * indev_act = lv_indev_get_act(); + lv_indev_t * indev_act = lv_indev_active(); if(indev_act) { if(indev_act->feedback_cb) indev_act->feedback_cb(indev_act, e); if(e->stop_processing) return LV_RESULT_OK; diff --git a/src/core/lv_obj_pos.c b/src/core/lv_obj_pos.c index a69ce74b5..82fe454df 100644 --- a/src/core/lv_obj_pos.c +++ b/src/core/lv_obj_pos.c @@ -835,7 +835,7 @@ bool lv_obj_area_is_visible(const lv_obj_t * obj, lv_area_t * area) /*Invalidate the object only if it belongs to the current or previous or one of the layers'*/ lv_obj_t * obj_scr = lv_obj_get_screen(obj); lv_display_t * disp = lv_obj_get_disp(obj_scr); - if(obj_scr != lv_display_get_screen_act(disp) && + if(obj_scr != lv_display_get_screen_active(disp) && obj_scr != lv_display_get_screen_prev(disp) && obj_scr != lv_display_get_layer_bottom(disp) && obj_scr != lv_display_get_layer_top(disp) && diff --git a/src/core/lv_obj_tree.c b/src/core/lv_obj_tree.c index 64efb0f9e..8f5911845 100644 --- a/src/core/lv_obj_tree.c +++ b/src/core/lv_obj_tree.c @@ -436,7 +436,7 @@ static void obj_delete_core(lv_obj_t * obj) } } - if(indev->group == group && obj == lv_indev_get_obj_act()) { + if(indev->group == group && obj == lv_indev_get_active_obj()) { lv_indev_reset(indev, obj); } indev = lv_indev_get_next(indev); diff --git a/src/core/lv_refr.c b/src/core/lv_refr.c index c07953790..c56618577 100644 --- a/src/core/lv_refr.c +++ b/src/core/lv_refr.c @@ -667,7 +667,7 @@ static void refr_area_part(lv_layer_t * layer) lv_obj_t * top_prev_scr = NULL; /*Get the most top object which is not covered by others*/ - top_act_scr = lv_refr_get_top_obj(&layer->clip_area, lv_display_get_screen_act(disp_refr)); + top_act_scr = lv_refr_get_top_obj(&layer->clip_area, lv_display_get_screen_active(disp_refr)); if(disp_refr->prev_scr) { top_prev_scr = lv_refr_get_top_obj(&layer->clip_area, disp_refr->prev_scr); } @@ -756,7 +756,7 @@ static void refr_obj_and_children(lv_layer_t * layer, lv_obj_t * top_obj) /*Normally always will be a top_obj (at least the screen) *but in special cases (e.g. if the screen has alpha) it won't. *In this case use the screen directly*/ - if(top_obj == NULL) top_obj = lv_display_get_screen_act(disp_refr); + if(top_obj == NULL) top_obj = lv_display_get_screen_active(disp_refr); if(top_obj == NULL) return; /*Shouldn't happen*/ /*Refresh the top object and its children*/ diff --git a/src/display/lv_display.c b/src/display/lv_display.c index e102bcbcd..7dd59540e 100644 --- a/src/display/lv_display.c +++ b/src/display/lv_display.c @@ -461,7 +461,7 @@ bool lv_display_is_double_buffered(lv_display_t * disp) * SCREENS *--------------------*/ -lv_obj_t * lv_display_get_screen_act(lv_display_t * disp) +lv_obj_t * lv_display_get_screen_active(lv_display_t * disp) { if(!disp) disp = lv_display_get_default(); if(!disp) { diff --git a/src/display/lv_display.h b/src/display/lv_display.h index eaf9dbdce..cccbdb521 100644 --- a/src/display/lv_display.h +++ b/src/display/lv_display.h @@ -327,7 +327,7 @@ bool lv_display_is_double_buffered(lv_display_t * disp); * (NULL to use the default screen) * @return pointer to the active screen object (loaded by 'lv_screen_load()') */ -struct _lv_obj_t * lv_display_get_screen_act(lv_display_t * disp); +struct _lv_obj_t * lv_display_get_screen_active(lv_display_t * disp); /** * Return with a pointer to the previous screen. Only used during screen transitions. @@ -384,7 +384,7 @@ void lv_screen_load_anim(struct _lv_obj_t * scr, lv_screen_load_anim_t anim_type */ static inline struct _lv_obj_t * lv_screen_active(void) { - return lv_display_get_screen_act(lv_display_get_default()); + return lv_display_get_screen_active(lv_display_get_default()); } /** diff --git a/src/indev/lv_indev.c b/src/indev/lv_indev.c index f7e2ed222..808a0130f 100644 --- a/src/indev/lv_indev.c +++ b/src/indev/lv_indev.c @@ -254,7 +254,7 @@ void lv_indev_enable(lv_indev_t * indev, bool en) } } -lv_indev_t * lv_indev_get_act(void) +lv_indev_t * lv_indev_active(void) { return indev_act; } @@ -445,7 +445,7 @@ void lv_indev_wait_release(lv_indev_t * indev) indev->wait_until_release = 1; } -lv_obj_t * lv_indev_get_obj_act(void) +lv_obj_t * lv_indev_get_active_obj(void) { return indev_obj_act; } @@ -1205,7 +1205,7 @@ static lv_obj_t * pointer_search_obj(lv_display_t * disp, lv_point_t * p) if(indev_obj_act) return indev_obj_act; /* Search the object in the active screen */ - indev_obj_act = lv_indev_search_obj(lv_display_get_screen_act(disp), p); + indev_obj_act = lv_indev_search_obj(lv_display_get_screen_active(disp), p); if(indev_obj_act) return indev_obj_act; indev_obj_act = lv_indev_search_obj(lv_display_get_layer_bottom(disp), p); diff --git a/src/indev/lv_indev.h b/src/indev/lv_indev.h index 54bf0f437..982271fe7 100644 --- a/src/indev/lv_indev.h +++ b/src/indev/lv_indev.h @@ -103,7 +103,7 @@ void lv_indev_enable(lv_indev_t * indev, bool en); * @return pointer to the currently processed input device or NULL if no input device processing * right now */ -lv_indev_t * lv_indev_get_act(void); +lv_indev_t * lv_indev_active(void); /** * Set the type of an input device @@ -228,7 +228,7 @@ void lv_indev_wait_release(lv_indev_t * indev); * Gets a pointer to the currently active object in the currently processed input device. * @return pointer to currently active object or NULL if no active object */ -struct _lv_obj_t * lv_indev_get_obj_act(void); +struct _lv_obj_t * lv_indev_get_active_obj(void); /** * Get a pointer to the indev read timer to diff --git a/src/indev/lv_indev_scroll.c b/src/indev/lv_indev_scroll.c index c4480a541..f564e0e22 100644 --- a/src/indev/lv_indev_scroll.c +++ b/src/indev/lv_indev_scroll.c @@ -120,7 +120,7 @@ void _lv_indev_scroll_throw_handler(lv_indev_t * indev) if(scroll_obj == NULL) return; if(indev->pointer.scroll_dir == LV_DIR_NONE) return; - lv_indev_t * indev_act = lv_indev_get_act(); + lv_indev_t * indev_act = lv_indev_active(); lv_coord_t scroll_throw = indev_act->scroll_throw; if(lv_obj_has_flag(scroll_obj, LV_OBJ_FLAG_SCROLL_MOMENTUM) == false) { @@ -272,7 +272,7 @@ static lv_obj_t * find_scroll_obj(lv_indev_t * indev) { lv_obj_t * obj_candidate = NULL; lv_dir_t dir_candidate = LV_DIR_NONE; - lv_indev_t * indev_act = lv_indev_get_act(); + lv_indev_t * indev_act = lv_indev_active(); lv_coord_t scroll_limit = indev_act->scroll_limit; /*Go until find a scrollable object in the current direction @@ -599,7 +599,7 @@ static lv_coord_t scroll_throw_predict_y(lv_indev_t * indev) lv_coord_t y = indev->pointer.scroll_throw_vect.y; lv_coord_t move = 0; - lv_indev_t * indev_act = lv_indev_get_act(); + lv_indev_t * indev_act = lv_indev_active(); lv_coord_t scroll_throw = indev_act->scroll_throw; while(y) { @@ -615,7 +615,7 @@ static lv_coord_t scroll_throw_predict_x(lv_indev_t * indev) lv_coord_t x = indev->pointer.scroll_throw_vect.x; lv_coord_t move = 0; - lv_indev_t * indev_act = lv_indev_get_act(); + lv_indev_t * indev_act = lv_indev_active(); lv_coord_t scroll_throw = indev_act->scroll_throw; while(x) { @@ -634,7 +634,7 @@ static lv_coord_t elastic_diff(lv_obj_t * scroll_obj, lv_coord_t diff, lv_coord_ lv_scroll_snap_t snap; snap = dir == LV_DIR_HOR ? lv_obj_get_scroll_snap_x(scroll_obj) : lv_obj_get_scroll_snap_y(scroll_obj); - lv_obj_t * act_obj = lv_indev_get_obj_act(); + lv_obj_t * act_obj = lv_indev_get_active_obj(); lv_coord_t snap_point = 0; lv_coord_t act_obj_point = 0; diff --git a/src/lv_api_map.h b/src/lv_api_map.h index 3eea8abf3..5ef29a162 100644 --- a/src/lv_api_map.h +++ b/src/lv_api_map.h @@ -102,6 +102,7 @@ static inline void lv_obj_move_background(lv_obj_t * obj) #define lv_obj_clear_flag lv_obj_remove_flag #define lv_obj_clear_state lv_obj_remove_state +#define lv_indev_get_act lv_indev_active #define lv_scr_act lv_screen_active #define lv_disp_create lv_display_create #define lv_disp_remove lv_display_remove @@ -206,6 +207,10 @@ static inline void lv_obj_move_background(lv_obj_t * obj) #define lv_btnmatrix_get_one_checked lv_buttonmatrix_get_one_checked #define lv_tabview_get_tab_btns lv_tabview_get_tab_buttons +#define lv_tabview_get_act lv_tabview_get_active +#define lv_tabview_set_act lv_tabview_set_active + +#define lv_tileview_get_tile_act lv_tileview_get_tile_active #define lv_msgbox_get_btns lv_msgbox_get_buttons diff --git a/src/misc/lv_event.h b/src/misc/lv_event.h index b1a05dfa6..bf8f6be69 100644 --- a/src/misc/lv_event.h +++ b/src/misc/lv_event.h @@ -56,8 +56,8 @@ typedef enum { LV_EVENT_SCROLL_THROW_BEGIN, LV_EVENT_SCROLL_END, /**< Scrolling ends*/ LV_EVENT_SCROLL, /**< Scrolling*/ - LV_EVENT_GESTURE, /**< A gesture is detected. Get the gesture with `lv_indev_get_gesture_dir(lv_indev_get_act());` */ - LV_EVENT_KEY, /**< A key is sent to the object. Get the key with `lv_indev_get_key(lv_indev_get_act());`*/ + LV_EVENT_GESTURE, /**< A gesture is detected. Get the gesture with `lv_indev_get_gesture_dir(lv_indev_active());` */ + LV_EVENT_KEY, /**< A key is sent to the object. Get the key with `lv_indev_get_key(lv_indev_active());`*/ LV_EVENT_FOCUSED, /**< The object is focused*/ LV_EVENT_DEFOCUSED, /**< The object is defocused*/ LV_EVENT_LEAVE, /**< The object is defocused but still selected*/ diff --git a/src/others/gridnav/lv_gridnav.c b/src/others/gridnav/lv_gridnav.c index f0d14245f..c5a6f9681 100644 --- a/src/others/gridnav/lv_gridnav.c +++ b/src/others/gridnav/lv_gridnav.c @@ -279,9 +279,9 @@ static void gridnav_event_cb(lv_event_t * e) code == LV_EVENT_CLICKED || code == LV_EVENT_RELEASED) { if(lv_group_get_focused(lv_obj_get_group(obj)) == obj) { /*Forward press/release related event too*/ - lv_indev_type_t t = lv_indev_get_type(lv_indev_get_act()); + lv_indev_type_t t = lv_indev_get_type(lv_indev_active()); if(t == LV_INDEV_TYPE_ENCODER || t == LV_INDEV_TYPE_KEYPAD) { - lv_obj_send_event(dsc->focused_obj, code, lv_indev_get_act()); + lv_obj_send_event(dsc->focused_obj, code, lv_indev_active()); } } } diff --git a/src/widgets/arc/lv_arc.c b/src/widgets/arc/lv_arc.c index 974bf78f3..7e3f095c9 100644 --- a/src/widgets/arc/lv_arc.c +++ b/src/widgets/arc/lv_arc.c @@ -450,7 +450,7 @@ static void lv_arc_event(const lv_obj_class_t * class_p, lv_event_t * e) lv_obj_t * obj = lv_event_get_target(e); lv_arc_t * arc = (lv_arc_t *)lv_event_get_target(e); if(code == LV_EVENT_PRESSING) { - lv_indev_t * indev = lv_indev_get_act(); + lv_indev_t * indev = lv_indev_active(); if(indev == NULL) return; /*Handle only pointers here*/ @@ -600,7 +600,7 @@ static void lv_arc_event(const lv_obj_class_t * class_p, lv_event_t * e) /*Leave edit mode if released. (No need to wait for LONG_PRESS)*/ lv_group_t * g = lv_obj_get_group(obj); bool editing = lv_group_get_editing(g); - lv_indev_type_t indev_type = lv_indev_get_type(lv_indev_get_act()); + lv_indev_type_t indev_type = lv_indev_get_type(lv_indev_active()); if(indev_type == LV_INDEV_TYPE_ENCODER) { if(editing) lv_group_set_editing(g, false); } diff --git a/src/widgets/buttonmatrix/lv_buttonmatrix.c b/src/widgets/buttonmatrix/lv_buttonmatrix.c index 00e99b23b..4f6a27b3e 100644 --- a/src/widgets/buttonmatrix/lv_buttonmatrix.c +++ b/src/widgets/buttonmatrix/lv_buttonmatrix.c @@ -421,7 +421,7 @@ static void lv_buttonmatrix_event(const lv_obj_class_t * class_p, lv_event_t * e lv_indev_t * indev = lv_event_get_indev(e); invalidate_button_area(obj, btnm->btn_id_sel); - lv_indev_type_t indev_type = lv_indev_get_type(lv_indev_get_act()); + lv_indev_type_t indev_type = lv_indev_get_type(lv_indev_active()); if(indev_type == LV_INDEV_TYPE_POINTER || indev_type == LV_INDEV_TYPE_BUTTON) { uint32_t btn_pr; /*Search the pressed area*/ diff --git a/src/widgets/chart/lv_chart.c b/src/widgets/chart/lv_chart.c index 919e14e4c..b30608529 100644 --- a/src/widgets/chart/lv_chart.c +++ b/src/widgets/chart/lv_chart.c @@ -686,7 +686,7 @@ static void lv_chart_event(const lv_obj_class_t * class_p, lv_event_t * e) lv_chart_t * chart = (lv_chart_t *)obj; if(code == LV_EVENT_PRESSED) { - lv_indev_t * indev = lv_indev_get_act(); + lv_indev_t * indev = lv_indev_active(); lv_point_t p; lv_indev_get_point(indev, &p); diff --git a/src/widgets/dropdown/lv_dropdown.c b/src/widgets/dropdown/lv_dropdown.c index 2ecb6b1d3..18b48b25e 100644 --- a/src/widgets/dropdown/lv_dropdown.c +++ b/src/widgets/dropdown/lv_dropdown.c @@ -672,7 +672,7 @@ static void lv_dropdown_event(const lv_obj_class_t * class_p, lv_event_t * e) if(code == LV_EVENT_FOCUSED) { lv_group_t * g = lv_obj_get_group(obj); bool editing = lv_group_get_editing(g); - lv_indev_type_t indev_type = lv_indev_get_type(lv_indev_get_act()); + lv_indev_type_t indev_type = lv_indev_get_type(lv_indev_active()); /*Encoders need special handling*/ if(indev_type == LV_INDEV_TYPE_ENCODER) { @@ -733,7 +733,7 @@ static void lv_dropdown_event(const lv_obj_class_t * class_p, lv_event_t * e) else if(c == LV_KEY_ENTER) { /* Handle the ENTER key only if it was send by an other object. * Do no process it if ENTER is sent by the dropdown because it's handled in LV_EVENT_RELEASED */ - lv_obj_t * indev_obj = lv_indev_get_obj_act(); + lv_obj_t * indev_obj = lv_indev_get_active_obj(); if(indev_obj != obj) { res = btn_release_handler(obj); if(res != LV_RESULT_OK) return; @@ -762,7 +762,7 @@ static void lv_dropdown_list_event(const lv_obj_class_t * class_p, lv_event_t * lv_dropdown_t * dropdown = (lv_dropdown_t *)dropdown_obj; if(code == LV_EVENT_RELEASED) { - if(lv_indev_get_scroll_obj(lv_indev_get_act()) == NULL) { + if(lv_indev_get_scroll_obj(lv_indev_active()) == NULL) { list_release_handler(list); } } @@ -1024,7 +1024,7 @@ static void draw_box_label(lv_obj_t * dropdown_obj, lv_layer_t * layer, uint32_t static lv_result_t btn_release_handler(lv_obj_t * obj) { lv_dropdown_t * dropdown = (lv_dropdown_t *)obj; - lv_indev_t * indev = lv_indev_get_act(); + lv_indev_t * indev = lv_indev_active(); if(lv_indev_get_scroll_obj(indev) == NULL) { if(lv_dropdown_is_open(obj)) { lv_dropdown_close(obj); @@ -1063,7 +1063,7 @@ static lv_result_t list_release_handler(lv_obj_t * list_obj) lv_obj_t * dropdown_obj = list->dropdown; lv_dropdown_t * dropdown = (lv_dropdown_t *)dropdown_obj; - lv_indev_t * indev = lv_indev_get_act(); + lv_indev_t * indev = lv_indev_active(); /*Leave edit mode once a new item is selected*/ if(lv_indev_get_type(indev) == LV_INDEV_TYPE_ENCODER) { dropdown->sel_opt_id_orig = dropdown->sel_opt_id; @@ -1099,7 +1099,7 @@ static void list_press_handler(lv_obj_t * list_obj) lv_obj_t * dropdown_obj = list->dropdown; lv_dropdown_t * dropdown = (lv_dropdown_t *)dropdown_obj; - lv_indev_t * indev = lv_indev_get_act(); + lv_indev_t * indev = lv_indev_active(); if(indev && (lv_indev_get_type(indev) == LV_INDEV_TYPE_POINTER || lv_indev_get_type(indev) == LV_INDEV_TYPE_BUTTON)) { lv_point_t p; lv_indev_get_point(indev, &p); diff --git a/src/widgets/roller/lv_roller.c b/src/widgets/roller/lv_roller.c index 0e67710ce..fc0a5609b 100644 --- a/src/widgets/roller/lv_roller.c +++ b/src/widgets/roller/lv_roller.c @@ -358,7 +358,7 @@ static void lv_roller_event(const lv_obj_class_t * class_p, lv_event_t * e) lv_anim_delete(get_label(obj), set_y_anim); } else if(code == LV_EVENT_PRESSING) { - lv_indev_t * indev = lv_indev_get_act(); + lv_indev_t * indev = lv_indev_active(); lv_point_t p; lv_indev_get_vect(indev, &p); @@ -374,7 +374,7 @@ static void lv_roller_event(const lv_obj_class_t * class_p, lv_event_t * e) } else if(code == LV_EVENT_FOCUSED) { lv_group_t * g = lv_obj_get_group(obj); - lv_indev_type_t indev_type = lv_indev_get_type(lv_indev_get_act()); + lv_indev_type_t indev_type = lv_indev_get_type(lv_indev_active()); /*Encoders need special handling*/ if(indev_type == LV_INDEV_TYPE_ENCODER) { @@ -678,7 +678,7 @@ static lv_result_t release_handler(lv_obj_t * obj) lv_obj_t * label = get_label(obj); if(label == NULL) return LV_RESULT_OK; - lv_indev_t * indev = lv_indev_get_act(); + lv_indev_t * indev = lv_indev_active(); lv_roller_t * roller = (lv_roller_t *)obj; /*Leave edit mode once a new option is selected*/ diff --git a/src/widgets/slider/lv_slider.c b/src/widgets/slider/lv_slider.c index 3ac007807..d36dd33e1 100644 --- a/src/widgets/slider/lv_slider.c +++ b/src/widgets/slider/lv_slider.c @@ -134,7 +134,7 @@ static void lv_slider_event(const lv_obj_class_t * class_p, lv_event_t * e) } else if(code == LV_EVENT_PRESSED) { /*Save the pressed coordinates*/ - lv_indev_get_point(lv_indev_get_act(), &slider->pressed_point); + lv_indev_get_point(lv_indev_active(), &slider->pressed_point); lv_obj_transform_point(obj, &slider->pressed_point, true, true); } else if(code == LV_EVENT_PRESSING) { @@ -150,7 +150,7 @@ static void lv_slider_event(const lv_obj_class_t * class_p, lv_event_t * e) /*Leave edit mode if released. (No need to wait for LONG_PRESS)*/ lv_group_t * g = lv_obj_get_group(obj); bool editing = lv_group_get_editing(g); - lv_indev_type_t indev_type = lv_indev_get_type(lv_indev_get_act()); + lv_indev_type_t indev_type = lv_indev_get_type(lv_indev_active()); if(indev_type == LV_INDEV_TYPE_ENCODER) { if(editing) { if(lv_slider_get_mode(obj) == LV_SLIDER_MODE_RANGE) { @@ -171,7 +171,7 @@ static void lv_slider_event(const lv_obj_class_t * class_p, lv_event_t * e) } } else if(code == LV_EVENT_FOCUSED) { - lv_indev_type_t indev_type = lv_indev_get_type(lv_indev_get_act()); + lv_indev_type_t indev_type = lv_indev_get_type(lv_indev_active()); if(indev_type == LV_INDEV_TYPE_ENCODER || indev_type == LV_INDEV_TYPE_KEYPAD) { slider->left_knob_focus = 0; } @@ -335,7 +335,7 @@ static void drag_start(lv_obj_t * obj) slider->value_to_set = &slider->bar.cur_value; } else if(mode == LV_SLIDER_MODE_RANGE) { - lv_indev_get_point(lv_indev_get_act(), &p); + lv_indev_get_point(lv_indev_active(), &p); lv_obj_transform_point(obj, &p, true, true); const bool is_rtl = LV_BASE_DIR_RTL == lv_obj_get_style_base_dir(obj, LV_PART_MAIN); const bool is_horizontal = is_slider_horizontal(obj); @@ -392,7 +392,7 @@ static void drag_start(lv_obj_t * obj) static void update_knob_pos(lv_obj_t * obj, bool check_drag) { lv_slider_t * slider = (lv_slider_t *)obj; - lv_indev_t * indev = lv_indev_get_act(); + lv_indev_t * indev = lv_indev_active(); if(lv_indev_get_type(indev) != LV_INDEV_TYPE_POINTER) return; if(lv_indev_get_scroll_obj(indev) != NULL) diff --git a/src/widgets/spinbox/lv_spinbox.c b/src/widgets/spinbox/lv_spinbox.c index 9367c7fa9..0dce2a353 100644 --- a/src/widgets/spinbox/lv_spinbox.c +++ b/src/widgets/spinbox/lv_spinbox.c @@ -374,7 +374,7 @@ static void lv_spinbox_event(const lv_obj_class_t * class_p, lv_event_t * e) lv_spinbox_t * spinbox = (lv_spinbox_t *)obj; if(code == LV_EVENT_RELEASED) { /*If released with an ENCODER then move to the next digit*/ - lv_indev_t * indev = lv_indev_get_act(); + lv_indev_t * indev = lv_indev_active(); if(lv_indev_get_type(indev) == LV_INDEV_TYPE_ENCODER && lv_group_get_editing(lv_obj_get_group(obj))) { if(spinbox->digit_count > 1) { if(spinbox->digit_step_dir == LV_DIR_RIGHT) { @@ -434,7 +434,7 @@ static void lv_spinbox_event(const lv_obj_class_t * class_p, lv_event_t * e) } } else if(code == LV_EVENT_KEY) { - lv_indev_type_t indev_type = lv_indev_get_type(lv_indev_get_act()); + lv_indev_type_t indev_type = lv_indev_get_type(lv_indev_active()); uint32_t c = *((uint32_t *)lv_event_get_param(e)); /*uint32_t because can be UTF-8*/ if(c == LV_KEY_RIGHT) { diff --git a/src/widgets/table/lv_table.c b/src/widgets/table/lv_table.c index a2dd78ad3..3b4d48429 100644 --- a/src/widgets/table/lv_table.c +++ b/src/widgets/table/lv_table.c @@ -496,14 +496,14 @@ static void lv_table_event(const lv_obj_class_t * class_p, lv_event_t * e) } else if(code == LV_EVENT_RELEASED) { lv_obj_invalidate(obj); - lv_indev_t * indev = lv_indev_get_act(); + lv_indev_t * indev = lv_indev_active(); lv_obj_t * scroll_obj = lv_indev_get_scroll_obj(indev); if(table->col_act != LV_TABLE_CELL_NONE && table->row_act != LV_TABLE_CELL_NONE && scroll_obj == NULL) { res = lv_obj_send_event(obj, LV_EVENT_VALUE_CHANGED, NULL); if(res != LV_RESULT_OK) return; } - lv_indev_type_t indev_type = lv_indev_get_type(lv_indev_get_act()); + lv_indev_type_t indev_type = lv_indev_get_type(lv_indev_active()); if(indev_type == LV_INDEV_TYPE_POINTER || indev_type == LV_INDEV_TYPE_BUTTON) { table->col_act = LV_TABLE_CELL_NONE; table->row_act = LV_TABLE_CELL_NONE; @@ -896,7 +896,7 @@ static lv_result_t get_pressed_cell(lv_obj_t * obj, uint32_t * row, uint32_t * c { lv_table_t * table = (lv_table_t *)obj; - lv_indev_type_t type = lv_indev_get_type(lv_indev_get_act()); + lv_indev_type_t type = lv_indev_get_type(lv_indev_active()); if(type != LV_INDEV_TYPE_POINTER && type != LV_INDEV_TYPE_BUTTON) { if(col) *col = LV_TABLE_CELL_NONE; if(row) *row = LV_TABLE_CELL_NONE; @@ -904,7 +904,7 @@ static lv_result_t get_pressed_cell(lv_obj_t * obj, uint32_t * row, uint32_t * c } lv_point_t p; - lv_indev_get_point(lv_indev_get_act(), &p); + lv_indev_get_point(lv_indev_active(), &p); lv_coord_t tmp; if(col) { diff --git a/src/widgets/tabview/lv_tabview.c b/src/widgets/tabview/lv_tabview.c index 1f5c68328..b6fac70d4 100644 --- a/src/widgets/tabview/lv_tabview.c +++ b/src/widgets/tabview/lv_tabview.c @@ -118,7 +118,7 @@ lv_obj_t * lv_tabview_add_tab(lv_obj_t * obj, const char * name) tabview->tab_cnt++; if(tabview->tab_cnt == 1) { - lv_tabview_set_act(obj, 0, LV_ANIM_OFF); + lv_tabview_set_active(obj, 0, LV_ANIM_OFF); } lv_buttonmatrix_set_button_ctrl(buttons, tabview->tab_cur, LV_BUTTONMATRIX_CTRL_CHECKED); @@ -140,7 +140,7 @@ void lv_tabview_rename_tab(lv_obj_t * obj, uint32_t id, const char * new_name) lv_obj_invalidate(obj); } -void lv_tabview_set_act(lv_obj_t * obj, uint32_t id, lv_anim_enable_t anim_en) +void lv_tabview_set_active(lv_obj_t * obj, uint32_t id, lv_anim_enable_t anim_en) { LV_ASSERT_OBJ(obj, MY_CLASS); lv_tabview_t * tabview = (lv_tabview_t *)obj; @@ -177,7 +177,7 @@ void lv_tabview_set_act(lv_obj_t * obj, uint32_t id, lv_anim_enable_t anim_en) tabview->tab_cur = id; } -uint32_t lv_tabview_get_tab_act(lv_obj_t * obj) +uint32_t lv_tabview_get_tab_active(lv_obj_t * obj) { LV_ASSERT_OBJ(obj, MY_CLASS); lv_tabview_t * tabview = (lv_tabview_t *)obj; @@ -302,7 +302,7 @@ static void lv_tabview_event(const lv_obj_class_t * class_p, lv_event_t * e) lv_obj_t * target = lv_event_get_target(e); if(code == LV_EVENT_SIZE_CHANGED) { - lv_tabview_set_act(target, lv_tabview_get_tab_act(target), LV_ANIM_OFF); + lv_tabview_set_active(target, lv_tabview_get_tab_active(target), LV_ANIM_OFF); } } @@ -313,7 +313,7 @@ static void buttons_value_changed_event_cb(lv_event_t * e) lv_obj_t * tv = lv_obj_get_parent(buttons); uint32_t id = lv_buttonmatrix_get_selected_button(buttons); - lv_tabview_set_act(tv, id, LV_ANIM_OFF); + lv_tabview_set_active(tv, id, LV_ANIM_OFF); } static void cont_scroll_end_event_cb(lv_event_t * e) @@ -324,10 +324,10 @@ static void cont_scroll_end_event_cb(lv_event_t * e) lv_obj_t * tv = lv_obj_get_parent(cont); lv_tabview_t * tv_obj = (lv_tabview_t *)tv; if(code == LV_EVENT_LAYOUT_CHANGED) { - lv_tabview_set_act(tv, lv_tabview_get_tab_act(tv), LV_ANIM_OFF); + lv_tabview_set_active(tv, lv_tabview_get_tab_active(tv), LV_ANIM_OFF); } else if(code == LV_EVENT_SCROLL_END) { - lv_indev_t * indev = lv_indev_get_act(); + lv_indev_t * indev = lv_indev_active(); if(indev && indev->state == LV_INDEV_STATE_PRESSED) { return; } @@ -348,15 +348,15 @@ static void cont_scroll_end_event_cb(lv_event_t * e) if(t < 0) t = 0; bool new_tab = false; - if(t != (int32_t)lv_tabview_get_tab_act(tv)) new_tab = true; + if(t != (int32_t)lv_tabview_get_tab_active(tv)) new_tab = true; /*If not scrolled by an indev set the tab immediately*/ - if(lv_indev_get_act()) { - lv_tabview_set_act(tv, t, LV_ANIM_ON); + if(lv_indev_active()) { + lv_tabview_set_active(tv, t, LV_ANIM_ON); } else { - lv_tabview_set_act(tv, t, LV_ANIM_OFF); + lv_tabview_set_active(tv, t, LV_ANIM_OFF); } if(new_tab) lv_obj_send_event(tv, LV_EVENT_VALUE_CHANGED, NULL); diff --git a/src/widgets/tabview/lv_tabview.h b/src/widgets/tabview/lv_tabview.h index f5a008132..9fbf75532 100644 --- a/src/widgets/tabview/lv_tabview.h +++ b/src/widgets/tabview/lv_tabview.h @@ -48,9 +48,9 @@ lv_obj_t * lv_tabview_get_content(lv_obj_t * tv); lv_obj_t * lv_tabview_get_tab_buttons(lv_obj_t * tv); -void lv_tabview_set_act(lv_obj_t * obj, uint32_t id, lv_anim_enable_t anim_en); +void lv_tabview_set_active(lv_obj_t * obj, uint32_t id, lv_anim_enable_t anim_en); -uint32_t lv_tabview_get_tab_act(lv_obj_t * tv); +uint32_t lv_tabview_get_tab_active(lv_obj_t * tv); /********************** * MACROS diff --git a/src/widgets/textarea/lv_textarea.c b/src/widgets/textarea/lv_textarea.c index 9c584b480..bd3849092 100644 --- a/src/widgets/textarea/lv_textarea.c +++ b/src/widgets/textarea/lv_textarea.c @@ -1143,7 +1143,7 @@ static void refr_cursor_area(lv_obj_t * obj) static void update_cursor_position_on_click(lv_event_t * e) { - lv_indev_t * click_source = lv_indev_get_act(); + lv_indev_t * click_source = lv_indev_active(); if(click_source == NULL) return; lv_obj_t * obj = lv_event_get_target(e); diff --git a/src/widgets/tileview/lv_tileview.c b/src/widgets/tileview/lv_tileview.c index c087ffeb2..557fa34f1 100644 --- a/src/widgets/tileview/lv_tileview.c +++ b/src/widgets/tileview/lv_tileview.c @@ -119,7 +119,7 @@ void lv_obj_set_tile_id(lv_obj_t * tv, uint32_t col_id, uint32_t row_id, lv_anim LV_LOG_WARN("No tile found with at (%d,%d) index", (int)col_id, (int)row_id); } -lv_obj_t * lv_tileview_get_tile_act(lv_obj_t * obj) +lv_obj_t * lv_tileview_get_tile_active(lv_obj_t * obj) { lv_tileview_t * tv = (lv_tileview_t *) obj; return tv->tile_act; @@ -155,7 +155,7 @@ static void tileview_event_cb(lv_event_t * e) lv_tileview_t * tv = (lv_tileview_t *) obj; if(code == LV_EVENT_SCROLL_END) { - lv_indev_t * indev = lv_indev_get_act(); + lv_indev_t * indev = lv_indev_active(); if(indev && indev->state == LV_INDEV_STATE_PRESSED) { return; } diff --git a/src/widgets/tileview/lv_tileview.h b/src/widgets/tileview/lv_tileview.h index f44f9009f..5f3525173 100644 --- a/src/widgets/tileview/lv_tileview.h +++ b/src/widgets/tileview/lv_tileview.h @@ -53,7 +53,7 @@ lv_obj_t * lv_tileview_add_tile(lv_obj_t * tv, uint8_t col_id, uint8_t row_id, l void lv_obj_set_tile(lv_obj_t * tv, lv_obj_t * tile_obj, lv_anim_enable_t anim_en); void lv_obj_set_tile_id(lv_obj_t * tv, uint32_t col_id, uint32_t row_id, lv_anim_enable_t anim_en); -lv_obj_t * lv_tileview_get_tile_act(lv_obj_t * obj); +lv_obj_t * lv_tileview_get_tile_active(lv_obj_t * obj); /*===================== * Other functions |