From a7ee9d3a812d33f1c95ae73d9ad3d0194649c139 Mon Sep 17 00:00:00 2001 From: Raphael Coeffic Date: Sat, 11 Jun 2022 09:13:36 +0200 Subject: [PATCH] button: remove LV_OBJ_FLAG_CHECKABLE on text buttons --- radio/src/thirdparty/libopenui/src/button.cpp | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/radio/src/thirdparty/libopenui/src/button.cpp b/radio/src/thirdparty/libopenui/src/button.cpp index cf28843b4..366dcfe0d 100644 --- a/radio/src/thirdparty/libopenui/src/button.cpp +++ b/radio/src/thirdparty/libopenui/src/button.cpp @@ -41,8 +41,7 @@ Button::Button(Window* parent, const rect_t& rect, pressHandler(std::move(pressHandler)) { lv_obj_add_event_cb(lvobj, Button::long_pressed, LV_EVENT_LONG_PRESSED, nullptr); - if (windowFlag & BUTTON_CHECKED) - lv_obj_add_state(lvobj, LV_STATE_CHECKED); + update_checked_flag(lvobj, windowFlags); } void Button::check(bool checked) @@ -109,10 +108,7 @@ TextButton::TextButton(Window* parent, const rect_t& rect, std::string text, text(std::move(text)) { setTextFlags(textFlags | COLOR_THEME_PRIMARY1); - lv_obj_add_flag(lvobj, LV_OBJ_FLAG_CHECKABLE); - - if (windowFlags & BUTTON_CHECKED) - lv_obj_add_state(lvobj, LV_STATE_CHECKED); + update_checked_flag(lvobj, windowFlags); label = lv_label_create(lvobj); lv_label_set_text(label, this->text.c_str());