From f99c16c7aa7bc3ada03606c830e8c43fd0cd8aee Mon Sep 17 00:00:00 2001 From: Raphael Coeffic Date: Wed, 9 Feb 2022 15:20:22 +0100 Subject: [PATCH] Moved menu styles to theme --- radio/src/thirdparty/libopenui/src/menu.cpp | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/radio/src/thirdparty/libopenui/src/menu.cpp b/radio/src/thirdparty/libopenui/src/menu.cpp index 0e17c8a62..66b9136c2 100644 --- a/radio/src/thirdparty/libopenui/src/menu.cpp +++ b/radio/src/thirdparty/libopenui/src/menu.cpp @@ -54,18 +54,14 @@ MenuBody::MenuBody(Window * parent, const rect_t & rect): setPageHeight(MENUS_LINE_HEIGHT); } -void MenuBody::addLine(const std::string & text, std::function onPress, std::function isChecked) +void MenuBody::addLine(const std::string &text, std::function onPress, + std::function isChecked) { lines.emplace_back(text, std::move(onPress), std::move(isChecked)); lv_obj_t *btn = lv_list_add_btn(lvobj, nullptr, text.c_str()); - lv_obj_set_style_bg_color(btn, makeLvColor(COLOR_THEME_SECONDARY2), LV_PART_MAIN | LV_STATE_CHECKED); - lv_obj_set_style_bg_color(btn, makeLvColor(COLOR_THEME_SECONDARY2), LV_PART_MAIN | LV_STATE_CHECKED | LV_STATE_FOCUSED); - lv_obj_set_style_bg_opa(btn, LV_OPA_100, LV_PART_MAIN); - lv_obj_set_style_bg_opa(btn, LV_OPA_100, LV_PART_MAIN | LV_STATE_CHECKED); - lv_obj_set_style_bg_opa(btn, LV_OPA_100, LV_PART_MAIN | LV_STATE_CHECKED | LV_STATE_FOCUSED); lv_obj_add_flag(btn, LV_OBJ_FLAG_CHECKABLE); - lv_obj_add_event_cb(btn, menuBodyEventCallback, LV_EVENT_CLICKED, (void *) (lines.size() - 1)); - lv_obj_set_style_text_color(lvobj, makeLvColor(COLOR_THEME_PRIMARY2), LV_PART_MAIN | LV_STATE_FOCUSED); + lv_obj_add_event_cb(btn, menuBodyEventCallback, LV_EVENT_CLICKED, + (void *)(lines.size() - 1)); } void MenuBody::removeLines()