summaryrefslogtreecommitdiff
path: root/src/tangara/ui/themes.cpp
diff options
context:
space:
mode:
authorjacqueline <me@jacqueline.id.au>2024-06-14 13:34:41 +1000
committerjacqueline <me@jacqueline.id.au>2024-06-14 13:34:41 +1000
commit5086ab96ea648cd842addb02b188f29bff7bbadd (patch)
tree7a3579d655c906ace9e76c394c33eb164d7ce7aa /src/tangara/ui/themes.cpp
parent194f0e6b59259986b36448c376788c227d490f06 (diff)
parent37ed3996017e43b343e4880981d70c4a6d4a5636 (diff)
downloadtangara-fw-5086ab96ea648cd842addb02b188f29bff7bbadd.tar.gz
Merge branch 'jqln/lvgl-bump'
Diffstat (limited to 'src/tangara/ui/themes.cpp')
-rw-r--r--src/tangara/ui/themes.cpp18
1 files changed, 12 insertions, 6 deletions
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 <me@jacqueline.id.au>
+ *
+ * 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";