diff --git a/include/lv_compat_v7.h b/include/lv_compat_v7.h index cd06a1d3..1125a67e 100644 --- a/include/lv_compat_v7.h +++ b/include/lv_compat_v7.h @@ -1,7 +1,7 @@ #ifndef LV_COMPAT_V7_H #define LV_COMPAT_V7_H -#if 1 +#if 1 // lvgl.h not yet loaded here for version check /********************* * v7 COLORS @@ -38,11 +38,14 @@ #define LV_BTN_STATE_CHECKED_DISABLED LV_STATE_CHECKED + LV_STATE_DISABLED #define LV_BTN_STATE_RELEASED LV_STATE_DEFAULT -// State types -// #define lv_indev_state_t lv_indev_state_t -// #define lv_get_state_info_t ? -#define lv_style_state_t lv_state_t -#define lv_btn_state_t lv_state_t +/********************* + * v7 WIDGET APIS + *********************/ +#define lv_arc_get_type lv_arc_get_mode +#define lv_arc_set_type lv_arc_set_mode + +#define lv_bar_get_type lv_bar_get_mode +#define lv_bar_set_type lv_bar_set_mode #define lv_btn_get_state lv_obj_get_state #define lv_btn_set_state lv_obj_set_state @@ -50,12 +53,33 @@ #define lv_btn_set_checkable(obj, en) \ ((en) ? lv_obj_add_flag(obj, LV_OBJ_FLAG_CHECKABLE) : lv_obj_clear_flag(obj, LV_OBJ_FLAG_CHECKABLE)) +#define lv_btnmatrix_get_map lv_btnmatrix_get_map_array +#define lv_btnmatrix_get_one_check lv_btnmatrix_get_one_checked +#define lv_btnmatrix_set_one_check lv_btnmatrix_set_one_checked +#define lv_btnmatrix_get_active_btn lv_btnmatrix_get_selected_btn +#define lv_btnmatrix_set_focused_btn lv_btnmatrix_set_selected_btn + // lv_checkbox_is_inactive (C++ function, in Checkbox (lv_cb)) // Todo #define lv_checkbox_get_state lv_obj_get_state #define lv_checkbox_set_state lv_obj_set_state #define lv_checkbox_is_checked(obj) ((lv_obj_get_state(obj) & LV_STATE_CHECKED) ? true : false) #define lv_checkbox_set_checked(obj, en) \ ((en) ? lv_obj_add_state(obj, LV_STATE_CHECKED) : lv_obj_clear_state(obj, LV_STATE_CHECKED)) +#define lv_checkbox_set_disabled(obj, en) \ + ((en) ? lv_obj_add_state(obj, LV_STATE_DISABLED) : lv_obj_clear_state(obj, LV_STATE_DISABLED)) + +#define lv_cpicker_get_color_mode_fixed lv_colorwheel_get_color_mode_fixed +#define lv_cpicker_get_color lv_colorwheel_get_rgb +#define lv_cpicker_set_color lv_colorwheel_set_rgb +#define lv_cpicker_get_color_mode lv_colorwheel_get_color_mode +#define lv_cpicker_set_color_mode lv_colorwheel_set_mode +#define lv_cpicker_set_color_mode_fixed lv_colorwheel_set_mode_fixed +#define lv_cpicker_get_hsv lv_colorwheel_get_hsv +#define lv_cpicker_set_hsv lv_colorwheel_set_hsv + +#define lv_dropdown_set_draw_arrow(obj, en) lv_dropdown_set_symbol(obj, en ? LV_SYMBOL_DOWN : NULL) +#define lv_dropdown_get_show_selected lv_dropdown_get_selected_highlight +#define lv_dropdown_set_show_selected lv_dropdown_set_selected_highlight #define lv_imgbtn_get_state lv_obj_get_state #define lv_imgbtn_set_state lv_obj_set_state @@ -63,20 +87,51 @@ #define lv_imgbtn_set_checkable(obj, en) \ ((en) ? lv_obj_add_flag(obj, LV_OBJ_FLAG_CHECKABLE) : lv_obj_clear_flag(obj, LV_OBJ_FLAG_CHECKABLE)) -#define lv_switch_get_state lv_obj_get_state -#define lv_switch_set_state lv_obj_set_state +#define lv_led_get_bright lv_led_get_brightness +#define lv_led_set_bright lv_led_set_brightness + +#define lv_list_clean lv_obj_clean + +#define lv_msgbox_get_btns lv_msgbox_get_btnmatrix #define lv_obj_get_click(obj) (lv_obj_has_flag(obj, LV_OBJ_FLAG_CLICKABLE)) #define lv_obj_set_click(obj, en) \ ((en) ? lv_obj_add_flag(obj, LV_OBJ_FLAG_CLICKABLE) : lv_obj_clear_flag(obj, LV_OBJ_FLAG_CLICKABLE)) - #define lv_obj_get_hidden(obj) (lv_obj_has_flag(obj, LV_OBJ_FLAG_HIDDEN)) #define lv_obj_set_hidden(obj, en) \ ((en) ? lv_obj_add_flag(obj, LV_OBJ_FLAG_HIDDEN) : lv_obj_clear_flag(obj, LV_OBJ_FLAG_HIDDEN)) - #define lv_obj_is_focused(obj) (lv_obj_has_flag(obj, LV_OBJ_FLAG_FOCUSED)) // lv_obj_is_protected (C++ function, in Base object (lv_obj)) // Todo +#define lv_slider_get_type lv_slider_get_mode +#define lv_slider_set_type lv_slider_set_mode + +#define lv_switch_get_state lv_obj_get_state +#define lv_switch_set_state lv_obj_set_state + +#define lv_table_get_cell_crop(obj, row, col) lv_table_has_cell_ctrl(obj, row, col, LV_TABLE_CELL_CTRL_TEXT_CROP) +#define lv_table_set_cell_crop(obj, row, col, en) \ + ((en) ? lv_table_add_cell_ctrl(obj, row, col, LV_TABLE_CELL_CTRL_TEXT_CROP) \ + : lv_table_clear_cell_ctrl(obj, row, col, LV_TABLE_CELL_CTRL_TEXT_CROP)) +#define lv_table_get_cell_merge(obj, row, col) lv_table_has_cell_ctrl(obj, row, col, LV_TABLE_CELL_CTRL_MERGE_RIGHT) +#define lv_table_set_cell_merge_right(obj, row, col, en) \ + ((en) ? lv_table_add_cell_ctrl(obj, row, col, LV_TABLE_CELL_CTRL_MERGE_RIGHT) \ + : lv_table_clear_cell_ctrl(obj, row, col, LV_TABLE_CELL_CTRL_MERGE_RIGHT)) + +#define lv_tabview_set_tab_act lv_tabview_set_act +#define lv_tabview_get_tab_count(obj) ((lv_tabview_t*)obj)->tab_cnt +#define lv_tabview_get_tab(tabview, id) \ + (id >= 0 && id < lv_tabview_get_tab_count(tabview) ? lv_obj_get_child(lv_tabview_get_content(tabview), id) : NULL) + +#define lv_textarea_get_pwd_mode lv_textarea_get_password_mode +#define lv_textarea_set_pwd_mode lv_textarea_set_password_mode +#define lv_textarea_get_pwd_show_time lv_textarea_get_password_show_time +#define lv_textarea_set_pwd_show_time lv_textarea_set_password_show_time +#define lv_textarea_get_text_sel_en lv_textarea_get_text_selection +#define lv_textarea_set_text_sel lv_textarea_set_text_selection +#define lv_textarea_get_cursor_blink_time(obj) lv_obj_get_style_anim_time(obj, LV_PART_CURSOR) +#define lv_textarea_set_cursor_blink_time(obj, time) lv_obj_set_style_anim_time(obj, time, LV_PART_CURSOR) + /********************* * v7 CORE WIDGETS PARTS *********************/ @@ -212,6 +267,18 @@ // #define LV_WIN_PART_CONTENT_SCROLLABLE // #define LV_WIN_PART_SCROLLBAR LV_PART_SCROLLBAR +/********************* + * v7 ALIGNMENT + *********************/ +#define LV_ALIGN_IN_TOP_LEFT LV_ALIGN_TOP_LEFT +#define LV_ALIGN_IN_TOP_MID LV_ALIGN_TOP_MID +#define LV_ALIGN_IN_TOP_RIGHT LV_ALIGN_TOP_RIGHT +#define LV_ALIGN_IN_BOTTOM_LEFT LV_ALIGN_BOTTOM_LEFT +#define LV_ALIGN_IN_BOTTOM_MID LV_ALIGN_BOTTOM_MID +#define LV_ALIGN_IN_BOTTOM_RIGHT LV_ALIGN_BOTTOM_RIGHT +#define LV_ALIGN_IN_LEFT_MID LV_ALIGN_LEFT_MID +#define LV_ALIGN_IN_RIGHT_MID LV_ALIGN_RIGHT_MID + /********************* * v7 COMPATIBILITY TYPES *********************/ @@ -220,45 +287,67 @@ #define lv_disp_buf_t lv_disp_draw_buf_t #define lv_task_t lv_timer_t +// Object mode types +#define lv_bar_type_t lv_bar_mode_t +#define lv_arc_type_t lv_arc_mode_t +#define lv_cpicker_color_mode_t lv_colorwheel_mode_t +#define lv_dropdown_dir_t lv_dir_t +#define lv_slider_type_t lv_slider_mode_t + +// Object state types +// #define lv_indev_state_t lv_indev_state_t +// #define lv_get_state_info_t ? +#define lv_style_state_t lv_state_t +#define lv_btn_state_t lv_state_t + /********************* * v7 COMPATIBILITY APIS *********************/ #define lv_cont_create lv_obj_create // use base object instead #define lv_page_create lv_obj_create // use base object instead #define lv_cpicker_create lv_colorwheel_create -#define lv_cpicker_get_color lv_colorwheel_get_rgb -#define lv_cpicker_set_color lv_colorwheel_set_rgb -#define lv_dropdown_set_draw_arrow(obj, en) lv_dropdown_set_symbol(obj, en ? LV_SYMBOL_DOWN : NULL) -//#define lv_chart_set_range(chart, ymin, ymax) lv_chart_set_y_range(chart, LV_CHART_AXIS_PRIMARY_Y, ymin, ymax) +// #define lv_chart_set_range(chart, ymin, ymax) lv_chart_set_y_range(chart, LV_CHART_AXIS_PRIMARY_Y, ymin, ymax) #define lv_img_get_file_name(img) \ (((lv_img_ext_t*)lv_obj_get_ext_attr(img))->src_type == LV_IMG_SRC_FILE) \ ? (const char*)((lv_img_ext_t*)lv_obj_get_ext_attr(img))->src \ : "" -#define lv_list_clean lv_obj_clean #define lv_disp_buf_init lv_disp_draw_buf_init #define lv_obj_refresh_style _lv_obj_refresh_style #define lv_obj_get_style_list _lv_obj_get_style_list #define lv_obj_add_style_list _lv_obj_add_style_list #define lv_obj_report_style_mod lv_obj_report_style_change -#define lv_tabview_get_tab_count(obj) ((lv_tabview_t*)obj)->tab_cnt -#define lv_tabview_get_tab(tabview, id) \ - (id >= 0 && id < lv_tabview_get_tab_count(tabview) ? lv_obj_get_child(lv_tabview_get_content(tabview), id) : NULL) - /********************* * v7 OBSOLETE APIS *********************/ #define lv_btn_set_fit(obj, fit) #define lv_roller_set_auto_fit(obj, fit) #define lv_keyboard_set_cursor_manage(a, b) +#define lv_cont_get_fit_bottom(obj) +#define lv_cont_get_fit_left(obj) +#define lv_cont_get_fit_right(obj) +#define lv_cont_get_fit_top(obj) #define lv_cont_set_fit(obj, fit) -#define lv_cont_set_fit2(obj, fit) -#define lv_cont_set_fit4(obj, fit) +#define lv_cont_set_fit2(obj, hor, ver) +#define lv_cont_set_fit4(obj, left, right, top, bottom) #define lv_cont_set_layout(obj, layout) // Use: lv_obj_set_layout(obj, type) // with LV_LAYOUT_FLEX or LV_LAYOUT_GRID +#define lv_dropdown_get_max_height(obj) +#define lv_dropdown_set_max_height(obj, h) +#define lv_gauge_get_angle_offset(obj) +#define lv_gauge_get_line_count(obj) +#define lv_gauge_get_scale_angle(obj) +#define lv_gauge_get_style(obj, part) +#define lv_gauge_set_angle_offset(obj, val) +#define lv_gauge_set_critical_value(obj, val) +#define lv_gauge_set_range(obj, min, max) #define lv_obj_set_style_value_str(a, b, c) +#define lv_page_set_scrollable_fit(obj, fit) +#define lv_page_set_scrollable_fit2(obj, hor, ver) +#define lv_page_set_scrollable_fit4(obj, left, right, top, bottom) #define lv_textarea_set_cursor_hidden(a, b) #define lv_tabview_set_tab_name(obj, id, name) +#define lv_tileview_get_edge_flash(obj) false -#endif // LV_VERSION_CHECK(8, 0, 0) +#endif // 1 #endif // LV_COMPAT_V7_H \ No newline at end of file