From e58dcf6dc5332c60a346509436f9934d9e3bbfbb Mon Sep 17 00:00:00 2001 From: jacqueline Date: Wed, 12 Jun 2024 18:46:07 +1000 Subject: WIP fix issues introduced by lvgl version bump --- src/tangara/ui/themes.cpp | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) (limited to 'src/tangara/ui/themes.cpp') diff --git a/src/tangara/ui/themes.cpp b/src/tangara/ui/themes.cpp index 44638c55..726bd5f0 100644 --- a/src/tangara/ui/themes.cpp +++ b/src/tangara/ui/themes.cpp @@ -1,4 +1,11 @@ +/* + * Copyright 2024 jacqueline + * + * SPDX-License-Identifier: GPL-3.0-only + */ + #include "ui/themes.hpp" + #include "core/lv_obj.h" #include "core/lv_obj_style.h" #include "core/lv_obj_tree.h" @@ -6,10 +13,9 @@ #include "esp_log.h" #include "misc/lv_color.h" #include "misc/lv_style.h" -#include "widgets/lv_bar.h" -#include "widgets/lv_slider.h" - -LV_FONT_DECLARE(font_fusion_12); +#include "widgets/bar/lv_bar.h" +#include "widgets/button/lv_button.h" +#include "widgets/slider/lv_slider.h" namespace ui { namespace themes { @@ -42,9 +48,9 @@ void Theme::Callback(lv_obj_t* obj) { // Determine class name std::string class_name; - if (lv_obj_check_type(obj, &lv_btn_class)) { + if (lv_obj_check_type(obj, &lv_button_class)) { class_name = "button"; - } else if (lv_obj_check_type(obj, &lv_list_btn_class)) { + } else if (lv_obj_check_type(obj, &lv_list_button_class)) { class_name = "listbutton"; } else if (lv_obj_check_type(obj, &lv_bar_class)) { class_name = "bar"; -- cgit v1.2.3