From 83a5fd913f33cea6dd783c32b32e0325d3cfdfd4 Mon Sep 17 00:00:00 2001 From: "kkoenig1@optonline.com" Date: Wed, 9 Feb 2022 02:51:40 -0500 Subject: [PATCH] added choice to default group --- radio/src/thirdparty/libopenui/src/choice.cpp | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/radio/src/thirdparty/libopenui/src/choice.cpp b/radio/src/thirdparty/libopenui/src/choice.cpp index 0c1ab0826..f1d83e1c7 100644 --- a/radio/src/thirdparty/libopenui/src/choice.cpp +++ b/radio/src/thirdparty/libopenui/src/choice.cpp @@ -41,6 +41,11 @@ ChoiceBase::ChoiceBase(FormGroup * parent, const rect_t & rect, ChoiceType type, { lv_obj_add_event_cb(lvobj, choicePaintCallback, LV_EVENT_DRAW_MAIN_BEGIN, lvobj); label = lv_label_create(lvobj); + lv_group_t * def_group = lv_group_get_default(); + if(def_group) { + lv_group_add_obj(def_group, lvobj); + } + // Normal font and background color lv_obj_set_style_bg_color(lvobj, makeLvColor(COLOR_THEME_PRIMARY2), LV_PART_MAIN); lv_obj_set_style_bg_opa(lvobj, LV_OPA_100, LV_PART_MAIN); @@ -71,8 +76,13 @@ std::string Choice::getLabelText() std::string text = ""; if (textHandler != nullptr) text = textHandler(getValue()); - else if (getValue() < values.size()) - text = values[getValue()]; + else { + int val = getValue(); + val -= vmin; + if (val >= 0 && val < (int)values.size()) { + text = values[val]; + } + } return text; }