From 9763cc955c4f3b2c2af54b61c2c5ad77afef9603 Mon Sep 17 00:00:00 2001 From: jacqueline Date: Mon, 26 Jun 2023 12:55:46 +1000 Subject: Improve encoder driver It actually works and clicks now! Still a bit rough though. Need to dive into lvgl internals to work out what it's doing with enc_diff --- src/ui/screen_menu.cpp | 40 ++++++++++++++++++---------------------- 1 file changed, 18 insertions(+), 22 deletions(-) (limited to 'src/ui/screen_menu.cpp') diff --git a/src/ui/screen_menu.cpp b/src/ui/screen_menu.cpp index 94c8fa06..b6d0606a 100644 --- a/src/ui/screen_menu.cpp +++ b/src/ui/screen_menu.cpp @@ -6,8 +6,12 @@ #include "screen_menu.hpp" +#include "core/lv_event.h" +#include "esp_log.h" + #include "core/lv_group.h" #include "core/lv_obj_pos.h" +#include "extra/widgets/list/lv_list.h" #include "extra/widgets/menu/lv_menu.h" #include "extra/widgets/spinner/lv_spinner.h" #include "hal/lv_hal_disp.h" @@ -17,33 +21,25 @@ namespace ui { namespace screens { -Menu::Menu() { - lv_obj_t* menu = lv_menu_create(root_); - lv_obj_set_size(menu, lv_disp_get_hor_res(NULL), lv_disp_get_ver_res(NULL)); - lv_obj_center(menu); - - lv_obj_t* main_page = lv_menu_page_create(menu, NULL); - - lv_obj_t* container; - lv_obj_t* label; +static void item_click_cb(lv_event_t* ev) { + ESP_LOGI("menu", "clicked!"); +} - container = lv_menu_cont_create(main_page); - label = lv_label_create(container); - lv_label_set_text(label, "I am an item"); +Menu::Menu() { + lv_obj_t* list = lv_list_create(root_); + lv_obj_set_size(list, lv_disp_get_hor_res(NULL), lv_disp_get_ver_res(NULL)); + lv_obj_center(list); - container = lv_menu_cont_create(main_page); - label = lv_label_create(container); - lv_label_set_text(label, "I am also an item"); + lv_obj_t* button; - container = lv_menu_cont_create(main_page); - label = lv_label_create(container); - lv_label_set_text(label, "Item #3"); + button = lv_list_add_btn(list, NULL, "hi"); + lv_obj_add_event_cb(button, item_click_cb, LV_EVENT_CLICKED, NULL); - container = lv_menu_cont_create(main_page); - label = lv_label_create(container); - lv_label_set_text(label, "Yay!"); + button = lv_list_add_btn(list, NULL, "second"); + lv_obj_add_event_cb(button, item_click_cb, LV_EVENT_CLICKED, NULL); - lv_menu_set_page(menu, main_page); + button = lv_list_add_btn(list, NULL, "third"); + lv_obj_add_event_cb(button, item_click_cb, LV_EVENT_CLICKED, NULL); } Menu::~Menu() {} -- cgit v1.2.3