From 0721884ee981c298c2ccb0e229db6802545321c4 Mon Sep 17 00:00:00 2001 From: Gabor Kiss-Vamosi Date: Mon, 18 Sep 2023 22:57:30 +0200 Subject: [PATCH] refactor: disp->display, res->result/resolution, hor/ver->horizontal/vertical, txt->text, angle->rotation, zoom->scale --- Kconfig | 4 +- demos/benchmark/lv_demo_benchmark.c | 50 +-- demos/multilang/lv_demo_multilang.c | 4 +- demos/music/lv_demo_music_main.c | 12 +- demos/stress/lv_demo_stress.c | 4 +- demos/transform/lv_demo_transform.c | 6 +- demos/widgets/lv_demo_widgets.c | 4 +- docs/overview/style-props.md | 42 +-- env_support/cmsis-pack/lv_conf_cmsis.h | 4 +- .../others/snapshot/lv_example_snapshot_1.c | 4 +- .../others/snapshot/lv_example_snapshot_1.py | 4 +- examples/porting/lv_port_disp_template.c | 20 +- examples/styles/lv_example_style_14.c | 4 +- examples/styles/lv_example_style_14.py | 2 +- examples/styles/lv_example_style_15.c | 4 +- examples/styles/lv_example_style_15.py | 4 +- examples/styles/lv_example_style_6.c | 2 +- examples/styles/lv_example_style_6.py | 2 +- examples/widgets/bar/lv_example_bar_6.c | 4 +- .../btnmatrix/lv_example_btnmatrix_2.c | 4 +- .../widgets/calendar/lv_example_calendar_1.py | 2 +- examples/widgets/canvas/lv_example_canvas_1.c | 2 +- .../widgets/canvas/lv_example_canvas_1.py | 2 +- examples/widgets/chart/lv_example_chart_5.c | 4 +- examples/widgets/chart/lv_example_chart_5.py | 4 +- .../widgets/dropdown/lv_example_dropdown_3.c | 2 +- .../widgets/dropdown/lv_example_dropdown_3.py | 2 +- examples/widgets/img/lv_example_img_3.c | 2 +- examples/widgets/menu/lv_example_menu_1.c | 2 +- examples/widgets/menu/lv_example_menu_2.c | 2 +- examples/widgets/menu/lv_example_menu_3.c | 2 +- examples/widgets/menu/lv_example_menu_4.c | 2 +- examples/widgets/menu/lv_example_menu_5.c | 2 +- examples/widgets/scale/lv_example_scale_5.c | 2 +- examples/widgets/slider/lv_example_slider_3.c | 2 +- .../widgets/slider/lv_example_slider_3.py | 2 +- lv_conf_template.h | 8 +- lvgl.h | 8 +- scripts/style_api_gen.py | 24 +- src/core/lv_global.h | 6 +- src/core/lv_group.c | 26 +- src/core/lv_group.h | 2 +- src/core/lv_obj.c | 30 +- src/core/lv_obj_class.c | 10 +- src/core/lv_obj_draw.c | 6 +- src/core/lv_obj_event.c | 34 +- src/core/lv_obj_event.h | 8 +- src/core/lv_obj_pos.c | 46 +-- src/core/lv_obj_scroll.c | 38 +-- src/core/lv_obj_scroll.h | 6 +- src/core/lv_obj_style.c | 28 +- src/core/lv_obj_style.h | 4 +- src/core/lv_obj_style_gen.c | 8 +- src/core/lv_obj_style_gen.h | 14 +- src/core/lv_obj_tree.c | 24 +- src/core/lv_obj_tree.h | 6 +- src/core/lv_refr.c | 137 ++++---- src/core/lv_refr.h | 10 +- src/dev/{disp => display}/drm/lv_linux_drm.c | 28 +- src/dev/{disp => display}/drm/lv_linux_drm.h | 6 +- src/dev/{disp => display}/fb/lv_linux_fbdev.c | 34 +- src/dev/{disp => display}/fb/lv_linux_fbdev.h | 6 +- src/dev/{disp => display}/lcd/lv_nuttx_lcd.c | 28 +- src/dev/{disp => display}/lcd/lv_nuttx_lcd.h | 4 +- .../tft_espi/lv_tft_espi.cpp | 0 .../{disp => display}/tft_espi/lv_tft_espi.h | 4 +- .../input/touchscreen/lv_nuttx_touchscreen.c | 2 +- src/dev/sdl/lv_sdl_keyboard.c | 2 +- src/dev/sdl/lv_sdl_mouse.c | 6 +- src/dev/sdl/lv_sdl_mousewheel.c | 2 +- src/dev/sdl/lv_sdl_window.c | 128 ++++---- src/dev/sdl/lv_sdl_window.h | 12 +- src/{disp/lv_disp.c => display/lv_display.c} | 292 +++++++++--------- src/{disp/lv_disp.h => display/lv_display.h} | 158 +++++----- .../lv_display_private.h} | 32 +- src/draw/lv_draw.c | 14 +- src/draw/lv_draw.h | 6 +- src/draw/lv_draw_image.c | 8 +- src/draw/lv_draw_image.h | 2 +- src/draw/lv_draw_label.c | 28 +- src/draw/lv_draw_label.h | 2 +- src/draw/lv_draw_rect.c | 6 +- src/draw/lv_image_buf.c | 2 +- src/draw/lv_image_decoder.c | 125 ++++---- src/draw/lv_image_decoder.h | 48 ++- .../sw/blend/lv_draw_sw_blend_to_argb8888.c | 2 +- .../sw/blend/lv_draw_sw_blend_to_rgb565.c | 2 +- .../sw/blend/lv_draw_sw_blend_to_rgb888.c | 2 +- src/draw/sw/lv_draw_sw.c | 6 +- src/draw/sw/lv_draw_sw.h | 2 +- src/draw/sw/lv_draw_sw_bg_img.c | 4 +- src/draw/sw/lv_draw_sw_border.c | 2 +- src/draw/sw/lv_draw_sw_fill.c | 2 +- src/draw/sw/lv_draw_sw_gradient.c | 2 +- src/draw/sw/lv_draw_sw_img.c | 30 +- src/draw/sw/lv_draw_sw_letter.c | 6 +- src/draw/sw/lv_draw_sw_line.c | 2 +- src/draw/sw/lv_draw_sw_transform.c | 6 +- src/indev/lv_indev.c | 46 +-- src/indev/lv_indev.h | 8 +- src/indev/lv_indev_private.h | 2 +- src/indev/lv_indev_scroll.c | 12 +- src/libs/barcode/lv_barcode.c | 10 +- src/libs/barcode/lv_barcode.h | 4 +- src/libs/bmp/lv_bmp.c | 42 +-- src/libs/ffmpeg/lv_ffmpeg.c | 30 +- src/libs/ffmpeg/lv_ffmpeg.h | 4 +- src/libs/freetype/lv_freetype.c | 12 +- src/libs/freetype/lv_freetype.h | 4 +- src/libs/gif/lv_gif.c | 2 +- src/libs/jpg/lv_jpg.c | 32 +- src/libs/png/lv_png.c | 44 +-- src/libs/qrcode/lv_qrcode.c | 16 +- src/libs/qrcode/lv_qrcode.h | 4 +- src/lv_api_map.h | 85 ++++- src/lv_conf_internal.h | 14 +- src/lv_conf_kconfig.h | 6 +- src/lv_init.c | 6 +- src/lvgl_private.h | 2 +- src/misc/lv_assert.h | 2 +- src/misc/lv_async.c | 14 +- src/misc/lv_async.h | 4 +- src/misc/lv_bidi.c | 36 +-- src/misc/lv_bidi.h | 2 +- src/misc/lv_event.c | 10 +- src/misc/lv_event.h | 4 +- src/misc/lv_style.c | 8 +- src/misc/lv_style.h | 18 +- src/misc/lv_style_gen.c | 12 +- src/misc/lv_style_gen.h | 17 +- src/misc/{lv_txt.c => lv_text.c} | 176 +++++------ src/misc/{lv_txt.h => lv_text.h} | 46 +-- src/misc/{lv_txt_ap.c => lv_text_ap.c} | 32 +- src/misc/{lv_txt_ap.h => lv_text_ap.h} | 14 +- src/misc/lv_types.h | 10 +- src/osal/lv_cmsis_rtos2.c | 68 ++-- src/osal/lv_freertos.c | 60 ++-- src/osal/lv_os.h | 46 +-- src/osal/lv_os_none.c | 46 +-- src/osal/lv_pthread.c | 54 ++-- src/others/imgfont/lv_imgfont.c | 2 +- src/others/snapshot/lv_snapshot.c | 18 +- src/others/snapshot/lv_snapshot.h | 6 +- src/others/sysmon/lv_sysmon.c | 4 +- src/stdlib/builtin/lv_mem_core_builtin.c | 8 +- src/stdlib/clib/lv_mem_core_clib.c | 4 +- src/stdlib/lv_mem.c | 6 +- src/stdlib/lv_mem.h | 6 +- .../micropython/lv_mem_core_micropython.c | 4 +- src/themes/basic/lv_theme_basic.c | 4 +- src/themes/basic/lv_theme_basic.h | 4 +- src/themes/default/lv_theme_default.c | 12 +- src/themes/default/lv_theme_default.h | 2 +- src/themes/lv_theme.c | 4 +- src/themes/lv_theme.h | 4 +- src/themes/mono/lv_theme_mono.c | 6 +- src/themes/mono/lv_theme_mono.h | 2 +- src/widgets/animimage/lv_animimage.c | 2 +- src/widgets/arc/lv_arc.c | 10 +- src/widgets/bar/lv_bar.c | 4 +- src/widgets/buttonmatrix/lv_buttonmatrix.c | 24 +- src/widgets/calendar/lv_calendar.c | 6 +- src/widgets/calendar/lv_calendar.h | 4 +- src/widgets/canvas/lv_canvas.c | 2 +- src/widgets/chart/lv_chart.c | 20 +- src/widgets/chart/lv_chart.h | 4 +- src/widgets/checkbox/lv_checkbox.c | 14 +- src/widgets/dropdown/lv_dropdown.c | 66 ++-- src/widgets/image/lv_image.c | 80 ++--- src/widgets/image/lv_image.h | 16 +- src/widgets/imgbtn/lv_imgbtn.c | 8 +- src/widgets/keyboard/lv_keyboard.c | 16 +- src/widgets/label/lv_label.c | 82 ++--- src/widgets/label/lv_label.h | 2 +- src/widgets/led/lv_led.c | 4 +- src/widgets/line/lv_line.c | 4 +- src/widgets/list/lv_list.c | 2 +- src/widgets/meter/lv_meter.c | 12 +- src/widgets/msgbox/lv_msgbox.c | 2 +- src/widgets/objx_templ/lv_objx_templ.c | 4 +- src/widgets/roller/lv_roller.c | 28 +- src/widgets/scale/lv_scale.c | 34 +- src/widgets/slider/lv_slider.c | 14 +- src/widgets/span/lv_span.c | 78 ++--- src/widgets/spinbox/lv_spinbox.c | 4 +- src/widgets/switch/lv_switch.c | 6 +- src/widgets/table/lv_table.c | 42 +-- src/widgets/tabview/lv_tabview.c | 4 +- src/widgets/textarea/lv_textarea.c | 74 ++--- src/widgets/textarea/lv_textarea.h | 2 +- src/widgets/win/lv_win.c | 2 +- tests/src/lv_test_init.c | 12 +- tests/src/test_cases/draw/test_clip_corner.c | 2 +- tests/src/test_cases/draw/test_draw_layer.c | 24 +- .../src/test_cases/draw/test_draw_transform.c | 22 +- tests/src/test_cases/libs/test_barcode.c | 4 +- tests/src/test_cases/test_config.c | 6 +- tests/src/test_cases/test_obj_flags.c | 10 +- tests/src/test_cases/test_txt.c | 26 +- tests/src/test_cases/widgets/test_calendar.c | 4 +- tests/src/test_cases/widgets/test_chart.c | 4 +- tests/src/test_cases/widgets/test_win.c | 2 +- 202 files changed, 1894 insertions(+), 1814 deletions(-) rename src/dev/{disp => display}/drm/lv_linux_drm.c (96%) rename src/dev/{disp => display}/drm/lv_linux_drm.h (77%) rename src/dev/{disp => display}/fb/lv_linux_fbdev.c (86%) rename src/dev/{disp => display}/fb/lv_linux_fbdev.h (79%) rename src/dev/{disp => display}/lcd/lv_nuttx_lcd.c (83%) rename src/dev/{disp => display}/lcd/lv_nuttx_lcd.h (85%) rename src/dev/{disp => display}/tft_espi/lv_tft_espi.cpp (100%) rename src/dev/{disp => display}/tft_espi/lv_tft_espi.h (79%) rename src/{disp/lv_disp.c => display/lv_display.c} (67%) rename src/{disp/lv_disp.h => display/lv_display.h} (74%) rename src/{disp/lv_disp_private.h => display/lv_display_private.h} (84%) rename src/misc/{lv_txt.c => lv_text.c} (75%) rename src/misc/{lv_txt.h => lv_text.h} (82%) rename src/misc/{lv_txt_ap.c => lv_text_ap.c} (91%) rename src/misc/{lv_txt_ap.h => lv_text_ap.h} (76%) diff --git a/Kconfig b/Kconfig index 5ceb017c69..6eb4c23025 100644 --- a/Kconfig +++ b/Kconfig @@ -1026,8 +1026,8 @@ menu "LVGL configuration" config LV_USE_BMP bool "BMP decoder library" - config LV_USE_SJPG - bool "JPG + split JPG decoder library" + config LV_USE_JPG + bool "JPG decoder library" config LV_USE_GIF bool "GIF decoder library" diff --git a/demos/benchmark/lv_demo_benchmark.c b/demos/benchmark/lv_demo_benchmark.c index 3a0766f1b6..6d6987497d 100644 --- a/demos/benchmark/lv_demo_benchmark.c +++ b/demos/benchmark/lv_demo_benchmark.c @@ -9,7 +9,7 @@ #include "lv_demo_benchmark.h" #if LV_USE_DEMO_BENCHMARK -#include "../../src/disp/lv_disp_private.h" +#include "../../src/display/lv_display_private.h" /********************* * DEFINES @@ -74,7 +74,7 @@ static lv_style_t style_common; static bool scene_with_opa = true; static uint32_t last_flush_cb_call; static uint32_t render_start_time; -static void (*flush_cb_ori)(lv_disp_t *, const lv_area_t *, uint8_t *); +static void (*flush_cb_ori)(lv_display_t *, const lv_area_t *, uint8_t *); static uint32_t disp_ori_timer_period; static uint32_t anim_ori_timer_period; @@ -100,10 +100,10 @@ static void benchmark_event_remove(void); static void show_scene_report(void); static void calc_scene_statistics(void); -static lv_res_t load_next_scene(void); +static lv_result_t load_next_scene(void); static void next_scene_timer_cb(lv_timer_t * timer); static void single_scene_finsih_timer_cb(lv_timer_t * timer); -static void dummy_flush_cb(lv_disp_t * drv, const lv_area_t * area, uint8_t * pxmap); +static void dummy_flush_cb(lv_display_t * drv, const lv_area_t * area, uint8_t * pxmap); static void generate_report(void); static void rect_create(lv_style_t * style); @@ -666,7 +666,7 @@ void lv_demo_benchmark(lv_demo_benchmark_mode_t _mode) benchmark_init(); if(mode == LV_DEMO_BENCHMARK_MODE_RENDER_ONLY) { - while(load_next_scene() == LV_RES_OK) { + while(load_next_scene() == LV_RESULT_OK) { uint32_t i; for(i = 0; i < RENDER_REPEAT_CNT; i++) { /*Wait a little to be sure something happens with the animations*/ @@ -733,9 +733,9 @@ void lv_demo_benchmark_run_scene(lv_demo_benchmark_mode_t _mode, uint16_t scene_ static void benchmark_init(void) { - lv_disp_t * disp = lv_disp_get_default(); + lv_display_t * disp = lv_display_get_default(); - lv_disp_add_event(disp, benchmark_event_cb, LV_EVENT_ALL, NULL); + lv_display_add_event(disp, benchmark_event_cb, LV_EVENT_ALL, NULL); flush_cb_ori = disp->flush_cb; disp->flush_cb = dummy_flush_cb; @@ -785,12 +785,12 @@ static void benchmark_event_cb(lv_event_t * e) static void benchmark_event_remove(void) { - lv_disp_t * disp = lv_disp_get_default(); + lv_display_t * disp = lv_display_get_default(); uint32_t i; - for(i = 0; i < lv_disp_get_event_count(disp); i++) { - lv_event_dsc_t * dsc = lv_disp_get_event_dsc(disp, i); + for(i = 0; i < lv_display_get_event_count(disp); i++) { + lv_event_dsc_t * dsc = lv_display_get_event_dsc(disp, i); if(lv_event_dsc_get_cb(dsc) == benchmark_event_cb) { - lv_disp_remove_event(disp, i); + lv_display_remove_event(disp, i); return; } } @@ -827,9 +827,9 @@ static void calc_scene_statistics(void) } } -static lv_res_t load_next_scene(void) +static lv_result_t load_next_scene(void) { - if(scene_act >= 0 && scenes[scene_act].create_cb == NULL) return LV_RES_INV; + if(scene_act >= 0 && scenes[scene_act].create_cb == NULL) return LV_RESULT_INVALID; lv_obj_clean(scene_bg); @@ -841,14 +841,14 @@ static lv_res_t load_next_scene(void) scene_with_opa = true; } - if(scene_act >= 0 && scenes[scene_act].create_cb == NULL) return LV_RES_INV; + if(scene_act >= 0 && scenes[scene_act].create_cb == NULL) return LV_RESULT_INVALID; last_flush_cb_call = 0; rnd_reset(); scenes[scene_act].create_cb(); lv_label_set_text_fmt(title, "%s%s", scenes[scene_act].name, scene_with_opa ? " + opa" : ""); - return LV_RES_OK; + return LV_RESULT_OK; } static void next_scene_timer_cb(lv_timer_t * timer) @@ -857,9 +857,9 @@ static void next_scene_timer_cb(lv_timer_t * timer) calc_scene_statistics(); show_scene_report(); - lv_res_t res = load_next_scene(); + lv_result_t res = load_next_scene(); - if(res == LV_RES_INV) { + if(res == LV_RESULT_INVALID) { lv_timer_del(timer); generate_report(); } @@ -870,7 +870,7 @@ static void single_scene_finsih_timer_cb(lv_timer_t * timer) LV_UNUSED(timer); calc_scene_statistics(); - lv_disp_t * disp = lv_disp_get_default(); + lv_display_t * disp = lv_display_get_default(); disp->flush_cb = flush_cb_ori; if(mode == LV_DEMO_BENCHMARK_MODE_RENDER_ONLY) { @@ -886,13 +886,13 @@ static void single_scene_finsih_timer_cb(lv_timer_t * timer) lv_obj_invalidate(lv_scr_act()); } -static void dummy_flush_cb(lv_disp_t * drv, const lv_area_t * area, uint8_t * pxmap) +static void dummy_flush_cb(lv_display_t * drv, const lv_area_t * area, uint8_t * pxmap) { LV_UNUSED(area); if(mode == LV_DEMO_BENCHMARK_MODE_RENDER_AND_DRIVER) { /*Measure the time since render start after flushing*/ - bool last = lv_disp_flush_is_last(drv); + bool last = lv_display_flush_is_last(drv); flush_cb_ori(drv, area, pxmap); if(last) { @@ -908,7 +908,7 @@ static void dummy_flush_cb(lv_disp_t * drv, const lv_area_t * area, uint8_t * px } } else if(mode == LV_DEMO_BENCHMARK_MODE_REAL) { - bool last = lv_disp_flush_is_last(drv); + bool last = lv_display_flush_is_last(drv); flush_cb_ori(drv, area, pxmap); /*Measure the time since the previous last flush (full render)*/ @@ -929,10 +929,10 @@ static void dummy_flush_cb(lv_disp_t * drv, const lv_area_t * area, uint8_t * px } } else if(mode == LV_DEMO_BENCHMARK_MODE_RENDER_ONLY) { - bool last = lv_disp_flush_is_last(drv); + bool last = lv_display_flush_is_last(drv); /*Just bypass the driver and measure the pure rendering time*/ - lv_disp_flush_ready(drv); + lv_display_flush_ready(drv); if(last) { uint32_t t = lv_tick_elaps(render_start_time); @@ -950,7 +950,7 @@ static void dummy_flush_cb(lv_disp_t * drv, const lv_area_t * area, uint8_t * px static void generate_report(void) { - lv_disp_t * disp = lv_disp_get_default(); + lv_display_t * disp = lv_display_get_default(); disp->flush_cb = flush_cb_ori; if(mode == LV_DEMO_BENCHMARK_MODE_RENDER_ONLY) { @@ -1114,7 +1114,7 @@ static void img_create(lv_style_t * style, const void * src, bool rotate, bool z lv_image_set_src(obj, src); lv_obj_set_style_image_recolor(obj, lv_color_hex(rnd_next(0, 0xFFFFF0)), 0); - if(rotate) lv_image_set_angle(obj, rnd_next(0, 3599)); + if(rotate) lv_image_set_rotation(obj, rnd_next(0, 3599)); if(zoom) lv_image_set_zoom(obj, rnd_next(IMG_ZOOM_MIN, IMG_ZOOM_MAX)); lv_image_set_antialias(obj, aa); diff --git a/demos/multilang/lv_demo_multilang.c b/demos/multilang/lv_demo_multilang.c index ebc444be6f..4271df69ec 100644 --- a/demos/multilang/lv_demo_multilang.c +++ b/demos/multilang/lv_demo_multilang.c @@ -249,8 +249,8 @@ static void inactive_timer_cb(lv_timer_t * t) return; } - if(lv_disp_get_inactive_time(NULL) > 8000) { - lv_disp_trig_activity(NULL); + if(lv_display_get_inactive_time(NULL) > 8000) { + lv_display_trig_activity(NULL); lv_obj_scroll_by(cont, 100, 0, LV_ANIM_ON); lv_obj_add_flag(lv_layer_top(), LV_OBJ_FLAG_CLICKABLE); scrolled = true; diff --git a/demos/music/lv_demo_music_main.c b/demos/music/lv_demo_music_main.c index 42a7449c1b..b52c78188b 100644 --- a/demos/music/lv_demo_music_main.c +++ b/demos/music/lv_demo_music_main.c @@ -281,7 +281,7 @@ lv_obj_t * _lv_demo_music_main_create(lv_obj_t * parent) lv_anim_set_var(&a, album_image_obj); lv_anim_set_time(&a, 1000); lv_anim_set_delay(&a, INTRO_TIME + 1000); - lv_anim_set_values(&a, 1, LV_ZOOM_NONE); + lv_anim_set_values(&a, 1, LV_SCALE_NONE); lv_anim_set_exec_cb(&a, _image_set_zoom_anim_cb); lv_anim_set_ready_cb(&a, NULL); lv_anim_start(&a); @@ -305,7 +305,7 @@ lv_obj_t * _lv_demo_music_main_create(lv_obj_t * parent) lv_anim_set_var(&a, logo); lv_anim_set_time(&a, 400); lv_anim_set_delay(&a, INTRO_TIME + 800); - lv_anim_set_values(&a, LV_ZOOM_NONE, 10); + lv_anim_set_values(&a, LV_SCALE_NONE, 10); lv_anim_set_ready_cb(&a, lv_obj_del_anim_ready_cb); lv_anim_start(&a); @@ -373,7 +373,7 @@ void _lv_demo_music_pause(void) spectrum_i = 0; lv_anim_del(spectrum_obj, spectrum_anim_cb); lv_obj_invalidate(spectrum_obj); - lv_image_set_zoom(album_image_obj, LV_ZOOM_NONE); + lv_image_set_zoom(album_image_obj, LV_SCALE_NONE); if(sec_counter_timer) lv_timer_pause(sec_counter_timer); lv_obj_clear_state(play_obj, LV_STATE_CHECKED); } @@ -720,7 +720,7 @@ static void track_load(uint32_t id) lv_anim_set_path_cb(&a, lv_anim_path_linear); lv_anim_set_var(&a, album_image_obj); lv_anim_set_time(&a, 500); - lv_anim_set_values(&a, LV_ZOOM_NONE, LV_ZOOM_NONE / 2); + lv_anim_set_values(&a, LV_SCALE_NONE, LV_SCALE_NONE / 2); lv_anim_set_exec_cb(&a, _image_set_zoom_anim_cb); lv_anim_set_ready_cb(&a, NULL); lv_anim_start(&a); @@ -731,7 +731,7 @@ static void track_load(uint32_t id) lv_anim_set_var(&a, album_image_obj); lv_anim_set_time(&a, 500); lv_anim_set_delay(&a, 100); - lv_anim_set_values(&a, LV_ZOOM_NONE / 4, LV_ZOOM_NONE); + lv_anim_set_values(&a, LV_SCALE_NONE / 4, LV_SCALE_NONE); lv_anim_set_exec_cb(&a, _image_set_zoom_anim_cb); lv_anim_set_ready_cb(&a, NULL); lv_anim_start(&a); @@ -924,7 +924,7 @@ static void spectrum_anim_cb(void * a, int32_t v) } if(spectrum[spectrum_i][0] < 4) bar_rot += dir; - lv_image_set_zoom(album_image_obj, LV_ZOOM_NONE + spectrum[spectrum_i][0]); + lv_image_set_zoom(album_image_obj, LV_SCALE_NONE + spectrum[spectrum_i][0]); } static void start_anim_cb(void * a, int32_t v) diff --git a/demos/stress/lv_demo_stress.c b/demos/stress/lv_demo_stress.c index ab2e176210..8a73e393ca 100644 --- a/demos/stress/lv_demo_stress.c +++ b/demos/stress/lv_demo_stress.c @@ -62,8 +62,8 @@ static void obj_test_task_cb(lv_timer_t * tmr) switch(state) { case -1: { - lv_res_t res = lv_mem_test(); - if(res != LV_RES_OK) { + lv_result_t res = lv_mem_test(); + if(res != LV_RESULT_OK) { LV_LOG_ERROR("Memory integrity error"); } diff --git a/demos/transform/lv_demo_transform.c b/demos/transform/lv_demo_transform.c index 11f787bdab..9ea6baa7b4 100644 --- a/demos/transform/lv_demo_transform.c +++ b/demos/transform/lv_demo_transform.c @@ -87,7 +87,7 @@ void lv_demo_transform(void) card_to_transform = card_create(); lv_obj_center(card_to_transform); - lv_coord_t disp_w = lv_disp_get_hor_res(NULL); + lv_coord_t disp_w = lv_display_get_horizontal_resolution(NULL); lv_obj_t * arc = lv_arc_create(lv_scr_act()); lv_obj_set_size(arc, disp_w - 20, disp_w - 20); lv_arc_set_range(arc, 0, 270); @@ -148,14 +148,14 @@ static void arc_event_cb(lv_event_t * e) lv_obj_t * arc = lv_event_get_target(e); int32_t v = lv_arc_get_angle_end(arc); - lv_obj_set_style_transform_angle(card_to_transform, v * 10, 0); + lv_obj_set_style_transform_rotation(card_to_transform, v * 10, 0); } static void slider_event_cb(lv_event_t * e) { lv_obj_t * slider = lv_event_get_target(e); int32_t v = lv_slider_get_value(slider); - lv_obj_set_style_transform_zoom(card_to_transform, v, 0); + lv_obj_set_style_transform_scale(card_to_transform, v, 0); } #endif diff --git a/demos/widgets/lv_demo_widgets.c b/demos/widgets/lv_demo_widgets.c index b759a2ddc4..7e53d54eb8 100644 --- a/demos/widgets/lv_demo_widgets.c +++ b/demos/widgets/lv_demo_widgets.c @@ -1284,7 +1284,7 @@ static void slider_event_cb(lv_event_t * e) lv_snprintf(buf, sizeof(buf), "%"LV_PRId32, lv_slider_get_value(obj)); lv_point_t text_size; - lv_txt_get_size(&text_size, buf, font_normal, 0, 0, LV_COORD_MAX, LV_TEXT_FLAG_NONE); + lv_text_get_size(&text_size, buf, font_normal, 0, 0, LV_COORD_MAX, LV_TEXT_FLAG_NONE); lv_area_t txt_area; txt_area.x1 = draw_task->area.x1 + lv_area_get_width(&draw_task->area) / 2 - text_size.x / 2; @@ -1437,7 +1437,7 @@ static void chart_event_cb(lv_event_t * e) lv_snprintf(buf, sizeof(buf), "%"LV_PRIu32, ser->y_points[base_dsc->id2]); lv_point_t text_size; - lv_txt_get_size(&text_size, buf, font_normal, 0, 0, LV_COORD_MAX, LV_TEXT_FLAG_NONE); + lv_text_get_size(&text_size, buf, font_normal, 0, 0, LV_COORD_MAX, LV_TEXT_FLAG_NONE); lv_area_t txt_area; if(lv_chart_get_type(obj) == LV_CHART_TYPE_BAR) { diff --git a/docs/overview/style-props.md b/docs/overview/style-props.md index 3e9a383563..d1a674bbc8 100644 --- a/docs/overview/style-props.md +++ b/docs/overview/style-props.md @@ -120,8 +120,8 @@ Move the object with this value in Y direction. Applied after layouts, aligns an
  • Ext. draw No
    • -### transform_zoom -Zoom an objects. The value 256 (or `LV_ZOOM_NONE`) means normal size, 128 half size, 512 double size, and so on +### transform_scale +Zoom an objects. The value 256 (or `LV_SCALE_NONE`) means normal size, 128 half size, 512 double size, and so on -### transform_angle +### transform_rotation Rotate an objects. The value is interpreted in 0.1 degree units. E.g. 450 means 45 deg.