rework widgets, refactoring, fixes

This commit is contained in:
Gabor Kiss-Vamosi
2021-02-07 12:37:37 +01:00
parent 2cae4a27c1
commit 063d17d842
53 changed files with 629 additions and 673 deletions
+1 -1
View File
@@ -27,7 +27,7 @@ void lv_ex_btn_1(void)
lv_obj_add_event_cb(btn2, event_handler, NULL);
lv_obj_align(btn2, NULL, LV_ALIGN_CENTER, 0, 40);
lv_obj_add_flag(btn2, LV_OBJ_FLAG_CHECKABLE);
lv_obj_set_height(btn2, LV_SIZE_AUTO);
lv_obj_set_height(btn2, LV_SIZE_CONTENT);
label = lv_label_create(btn2, NULL);
lv_label_set_text(label, "Toggle");
@@ -26,6 +26,7 @@ void lv_keyboard_example_1(void)
ta = lv_textarea_create(lv_scr_act(), NULL);
lv_obj_align(ta, NULL, LV_ALIGN_IN_TOP_LEFT, 10, 10);
lv_obj_add_event_cb(ta, ta_event_cb, kb);
lv_textarea_set_placeholder_text(ta, "Hello");
ta = lv_textarea_create(lv_scr_act(), NULL);
lv_obj_align(ta, NULL, LV_ALIGN_IN_TOP_RIGHT, -10, 10);
@@ -23,7 +23,7 @@ static void lv_spinbox_decrement_event_cb(lv_obj_t * btn, lv_event_t e)
void lv_ex_spinbox_1(void)
{
spinbox = lv_spinbox_create(lv_scr_act());
lv_spinbox_set_range(spinbox, -1000, 90000);
lv_spinbox_set_range(spinbox, -1000, 25000);
lv_spinbox_set_digit_format(spinbox, 5, 2);
lv_spinbox_step_prev(spinbox);
lv_obj_set_width(spinbox, 100);
@@ -36,5 +36,7 @@ void lv_ex_tabview_1(void)
label = lv_label_create(tab3, NULL);
lv_label_set_text(label, "Third tab");
lv_obj_scroll_to_view_recursive(label, LV_ANIM_ON);
}
#endif
@@ -2,7 +2,7 @@
#if LV_USE_TILEVIEW
/**
* Create a 2x2 tile view and allow scrolling on in an "L" shape.
* Create a 2x2 tile view and allow scrolling only in an "L" shape.
* Demonstrate scroll chaining with a long list that
* scrolls the tile view when it cant't be scrolled further.
*/
@@ -16,9 +16,21 @@ void lv_ex_tileview_1(void)
lv_label_set_text(label, "Scroll down");
lv_obj_align(label, NULL, LV_ALIGN_CENTER, 0, 0);
/*Tile2: a list*/
/*Tile2: a button*/
lv_obj_t * tile2 = lv_tileview_add_tile(tv, 0, 1, LV_DIR_TOP | LV_DIR_RIGHT);
lv_obj_t * list = lv_list_create(tile2);
lv_obj_t * btn = lv_btn_create(tile2, NULL);
label = lv_label_create(btn, NULL);
lv_label_set_text(label, "Scroll up or right");
lv_obj_set_size(btn, LV_SIZE_CONTENT, LV_SIZE_CONTENT);
lv_obj_align(btn, NULL, LV_ALIGN_CENTER, 0, 0);
/*Tile3: a list*/
lv_obj_t * tile3 = lv_tileview_add_tile(tv, 1, 1, LV_DIR_LEFT);
lv_obj_t * list = lv_list_create(tile3);
lv_obj_set_size(list, LV_COORD_PCT(100), LV_COORD_PCT(100));
lv_list_add_btn(list, NULL, "One", NULL);
@@ -29,15 +41,9 @@ void lv_ex_tileview_1(void)
lv_list_add_btn(list, NULL, "Six", NULL);
lv_list_add_btn(list, NULL, "Seven", NULL);
lv_list_add_btn(list, NULL, "Eight", NULL);
lv_list_add_btn(list, NULL, "Nine", NULL);
lv_list_add_btn(list, NULL, "Ten", NULL);
/*Tile3: a button*/
lv_obj_t * tile3 = lv_tileview_add_tile(tv, 1, 1, LV_DIR_LEFT);
lv_obj_t * btn = lv_btn_create(tile3, NULL);
lv_obj_align(btn, NULL, LV_ALIGN_CENTER, 0, 0);
label = lv_label_create(btn, NULL);
lv_label_set_text(label, "No scroll up");
lv_obj_align(label, NULL, LV_ALIGN_CENTER, 0, 0);
}
#endif
+5 -5
View File
@@ -6,17 +6,17 @@
static void event_handler(lv_obj_t * obj, lv_event_t event)
{
if(event == LV_EVENT_CLICKED) {
printf("Value: %d\n", lv_obj_get_child_id(obj));
printf("Button: %d\n", lv_obj_get_child_id(obj));
}
}
void lv_ex_win_1(void)
{
lv_obj_t * win = lv_win_create(lv_scr_act(), LV_SIZE_AUTO);
lv_win_add_btn(win, LV_SYMBOL_LEFT, 40, 40, event_handler);
lv_obj_t * win = lv_win_create(lv_scr_act(), 60);
lv_win_add_btn(win, LV_SYMBOL_LEFT, 40, event_handler);
lv_win_add_title(win, "A title");
lv_win_add_btn(win, LV_SYMBOL_RIGHT, 40, 40, event_handler);
lv_win_add_btn(win, LV_SYMBOL_CLOSE, 40, 40, event_handler);
lv_win_add_btn(win, LV_SYMBOL_RIGHT, 40, event_handler);
lv_win_add_btn(win, LV_SYMBOL_CLOSE, 60, event_handler);
lv_obj_t * cont = lv_win_get_content(win); /*Content can be aded here*/
lv_obj_t * label = lv_label_create(cont, NULL);