From 00b1c80d3ce407acd082625b84bbeff7845788d5 Mon Sep 17 00:00:00 2001 From: Gabor Kiss-Vamosi Date: Tue, 23 Feb 2021 11:31:10 +0100 Subject: [PATCH] feat(examples): fix examples and add new scroll examples --- examples/lv_examples.h | 1 + examples/scroll/lv_example_scroll.h | 41 +++++++++++++++ examples/scroll/lv_example_scroll_1.c | 48 +++++++++++++++++ examples/scroll/lv_example_scroll_2.c | 51 +++++++++++++++++++ examples/widgets/bar/lv_example_bar_3.c | 14 ++++- examples/widgets/chart/lv_example_chart_4.c | 2 +- examples/widgets/slider/lv_example_slider_3.c | 3 +- 7 files changed, 156 insertions(+), 4 deletions(-) create mode 100644 examples/scroll/lv_example_scroll.h create mode 100644 examples/scroll/lv_example_scroll_1.c create mode 100644 examples/scroll/lv_example_scroll_2.c diff --git a/examples/lv_examples.h b/examples/lv_examples.h index 0ca3c57db..fa51bc271 100644 --- a/examples/lv_examples.h +++ b/examples/lv_examples.h @@ -17,6 +17,7 @@ extern "C" { #include "get_started/lv_example_get_started.h" #include "widgets/lv_example_widgets.h" #include "layouts/lv_example_layout.h" +#include "scroll/lv_example_scroll.h" /********************* * DEFINES diff --git a/examples/scroll/lv_example_scroll.h b/examples/scroll/lv_example_scroll.h new file mode 100644 index 000000000..740e47b7e --- /dev/null +++ b/examples/scroll/lv_example_scroll.h @@ -0,0 +1,41 @@ +/** + * @file lv_example_scroll.h + * + */ + +#ifndef LV_EXAMPLE_SCROLL_H +#define LV_EXAMPLE_SCROLL_H + +#ifdef __cplusplus +extern "C" { +#endif + +/********************* + * INCLUDES + *********************/ + +/********************* + * DEFINES + *********************/ + +/********************** + * TYPEDEFS + **********************/ + +/********************** + * GLOBAL PROTOTYPES + **********************/ +void lv_example_scroll_1(void); +void lv_example_scroll_2(void); +void lv_example_scroll_3(void); +void lv_example_scroll_4(void); + +/********************** + * MACROS + **********************/ + +#ifdef __cplusplus +} /* extern "C" */ +#endif + +#endif /*LV_EXAMPLE_SCROLL_H*/ diff --git a/examples/scroll/lv_example_scroll_1.c b/examples/scroll/lv_example_scroll_1.c new file mode 100644 index 000000000..14b1e19d2 --- /dev/null +++ b/examples/scroll/lv_example_scroll_1.c @@ -0,0 +1,48 @@ +#include "../../lvgl.h" +#if LV_BUILD_EXAMPLES + +/** + * Demonstrate how scrolling appears automatically + */ +void lv_example_scroll_1(void) +{ + /*Create an object with the new style*/ + lv_obj_t * panel = lv_obj_create(lv_scr_act(), NULL); + lv_obj_set_size(panel, 200, 200); + lv_obj_center(panel); + + lv_obj_t * child; + lv_obj_t * label; + + child = lv_obj_create(panel, NULL); + lv_obj_set_pos(child, 0, 0); + label = lv_label_create(child, NULL); + lv_label_set_text(label, "Zero"); + lv_obj_center(label); + + child = lv_obj_create(panel, NULL); + lv_obj_set_pos(child, -40, 100); + label = lv_label_create(child, NULL); + lv_label_set_text(label, "Left"); + lv_obj_center(label); + + child = lv_obj_create(panel, NULL); + lv_obj_set_pos(child, 90, -30); + label = lv_label_create(child, NULL); + lv_label_set_text(label, "Top"); + lv_obj_center(label); + + child = lv_obj_create(panel, NULL); + lv_obj_set_pos(child, 150, 80); + label = lv_label_create(child, NULL); + lv_label_set_text(label, "Right"); + lv_obj_center(label); + + child = lv_obj_create(panel, NULL); + lv_obj_set_pos(child, 60, 170); + label = lv_label_create(child, NULL); + lv_label_set_text(label, "Bottom"); + lv_obj_center(label); +} + +#endif diff --git a/examples/scroll/lv_example_scroll_2.c b/examples/scroll/lv_example_scroll_2.c new file mode 100644 index 000000000..de673c156 --- /dev/null +++ b/examples/scroll/lv_example_scroll_2.c @@ -0,0 +1,51 @@ +#include "../../lvgl.h" +#if LV_BUILD_EXAMPLES + +static void sw_event_cb(lv_obj_t * sw, lv_event_t e) +{ + if(e == LV_EVENT_VALUE_CHANGED) { + lv_obj_t * list = lv_event_get_user_data(); + + if(lv_obj_has_state(sw, LV_STATE_CHECKED)) lv_obj_add_flag(list, LV_OBJ_FLAG_SCROLL_ONE); + else lv_obj_clear_flag(list, LV_OBJ_FLAG_SCROLL_ONE); + } +} + +/** + * Show an example to scroll snap + */ +void lv_example_scroll_2(void) +{ + lv_obj_t * list = lv_obj_create(lv_scr_act(), NULL); + lv_obj_set_size(list, 280, 150); + lv_obj_set_scroll_snap_align_x(list, LV_SCROLL_SNAP_ALIGN_CENTER); + lv_obj_set_layout(list, &lv_flex_queue); + + uint32_t i; + for(i = 0; i < 10; i++) { + lv_obj_t * btn = lv_btn_create(list, NULL); + lv_obj_set_size(btn, 150, 100); + + lv_obj_t * label = lv_label_create(btn, NULL); + if(i == 3) { + lv_label_set_text_fmt(label, "Panel %d\nno snap", i); + lv_obj_clear_flag(btn, LV_OBJ_FLAG_SNAPABLE); + } else { + lv_label_set_text_fmt(label, "Panel %d", i); + } + + lv_obj_center(label); + } + lv_obj_update_snap(list, LV_ANIM_ON); + + + /*Switch between "One scroll" and "Normal scroll" mode*/ + lv_obj_t * sw = lv_switch_create(lv_scr_act(), NULL); + lv_obj_align(sw, NULL, LV_ALIGN_IN_TOP_RIGHT, -20, 10); + lv_obj_add_event_cb(sw, sw_event_cb, list); + lv_obj_t * label = lv_label_create(lv_scr_act(), NULL); + lv_label_set_text(label, "One scroll"); + lv_obj_align(label, sw, LV_ALIGN_OUT_BOTTOM_MID, 0, 10); +} + +#endif diff --git a/examples/widgets/bar/lv_example_bar_3.c b/examples/widgets/bar/lv_example_bar_3.c index 4012ba000..c28415485 100644 --- a/examples/widgets/bar/lv_example_bar_3.c +++ b/examples/widgets/bar/lv_example_bar_3.c @@ -1,7 +1,7 @@ #include "../../../lvgl.h" #if LV_USE_BAR && LV_BUILD_EXAMPLES -static void set_temp(lv_obj_t * bar, int32_t temp) +static void set_temp(void * bar, int32_t temp) { lv_bar_set_value(bar, temp, LV_ANIM_ON); @@ -24,13 +24,23 @@ void lv_example_bar_3(void) lv_style_set_bg_grad_dir(&style_indic, LV_GRAD_DIR_VER); lv_style_set_content_align(&style_indic, LV_ALIGN_OUT_LEFT_TOP); lv_style_set_content_ofs_x(&style_indic, -3); + lv_style_set_content_color(&style_indic, LV_COLOR_GRAY); lv_obj_t * bar = lv_bar_create(lv_scr_act(), NULL); lv_obj_add_style(bar, LV_PART_INDICATOR, LV_STATE_DEFAULT, &style_indic); lv_obj_set_size(bar, 20, 200); lv_obj_align(bar, NULL, LV_ALIGN_CENTER, 0, 0); lv_bar_set_range(bar, -20, 40); - set_temp(bar, 30); + + lv_anim_t a; + lv_anim_init(&a); + lv_anim_set_exec_cb(&a, set_temp); + lv_anim_set_time(&a, 3000); + lv_anim_set_playback_time(&a, 3000); + lv_anim_set_var(&a, bar); + lv_anim_set_values(&a, -20, 40); + lv_anim_set_repeat_count(&a, LV_ANIM_REPEAT_INFINITE); + lv_anim_start(&a); } diff --git a/examples/widgets/chart/lv_example_chart_4.c b/examples/widgets/chart/lv_example_chart_4.c index 6d411e411..59bca7f01 100644 --- a/examples/widgets/chart/lv_example_chart_4.c +++ b/examples/widgets/chart/lv_example_chart_4.c @@ -13,7 +13,7 @@ static void event_cb(lv_obj_t * chart, lv_event_t e) } else if(e == LV_EVENT_DRAW_POST_END) { int32_t id = lv_chart_get_pressed_point(chart); - if(id < 0) return; + if(id == LV_CHART_POINT_ID_NONE) return; LV_LOG_USER("Selected point %d\n", id); diff --git a/examples/widgets/slider/lv_example_slider_3.c b/examples/widgets/slider/lv_example_slider_3.c index 007c6a759..a42b23881 100644 --- a/examples/widgets/slider/lv_example_slider_3.c +++ b/examples/widgets/slider/lv_example_slider_3.c @@ -21,8 +21,9 @@ void lv_example_slider_3(void) /*Now use only a local style.*/ lv_obj_set_style_content_ofs_y(slider, LV_PART_INDICATOR, LV_STATE_DEFAULT, -20); + lv_obj_set_style_content_color(slider, LV_PART_INDICATOR, LV_STATE_DEFAULT, LV_COLOR_GRAY); - /*To update the avlue text*/ + /*To update the value text*/ lv_event_send(slider, LV_EVENT_VALUE_CHANGED, NULL); }