From 01d7036e7827fe8590356e3535739e4353fc06b1 Mon Sep 17 00:00:00 2001 From: Raphael Coeffic Date: Tue, 27 Sep 2022 04:11:45 +0200 Subject: [PATCH] TextButton: rely on LVGL theme for text color (#67) --- radio/src/thirdparty/libopenui/src/button.cpp | 6 ++---- radio/src/thirdparty/libopenui/src/button.h | 3 +-- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/radio/src/thirdparty/libopenui/src/button.cpp b/radio/src/thirdparty/libopenui/src/button.cpp index 366dcfe0d..438fc1cff 100644 --- a/radio/src/thirdparty/libopenui/src/button.cpp +++ b/radio/src/thirdparty/libopenui/src/button.cpp @@ -102,12 +102,10 @@ void Button::long_pressed(lv_event_t* e) TextButton::TextButton(Window* parent, const rect_t& rect, std::string text, std::function pressHandler, - WindowFlags windowFlags, LcdFlags textFlags) : - Button(parent, rect, std::move(pressHandler), windowFlags, textFlags, - lv_btn_create), + WindowFlags windowFlags) : + Button(parent, rect, std::move(pressHandler), windowFlags, 0, lv_btn_create), text(std::move(text)) { - setTextFlags(textFlags | COLOR_THEME_PRIMARY1); update_checked_flag(lvobj, windowFlags); label = lv_label_create(lvobj); diff --git a/radio/src/thirdparty/libopenui/src/button.h b/radio/src/thirdparty/libopenui/src/button.h index 0a5aa103c..89ae019fe 100644 --- a/radio/src/thirdparty/libopenui/src/button.h +++ b/radio/src/thirdparty/libopenui/src/button.h @@ -78,8 +78,7 @@ class TextButton: public Button public: TextButton(Window* parent, const rect_t& rect, std::string text, std::function pressHandler = nullptr, - WindowFlags windowFlags = BUTTON_BACKGROUND | OPAQUE, - LcdFlags textFlags = 0); + WindowFlags windowFlags = BUTTON_BACKGROUND | OPAQUE); #if defined(DEBUG_WINDOWS) std::string getName() const override