diff --git a/radio/src/thirdparty/libopenui/src/button.h b/radio/src/thirdparty/libopenui/src/button.h index 7af9a52a9..8b160c6ca 100644 --- a/radio/src/thirdparty/libopenui/src/button.h +++ b/radio/src/thirdparty/libopenui/src/button.h @@ -111,7 +111,7 @@ class Button : public FormField { class TextButton : public Button { public: - TextButton(Window * parent, const rect_t & rect, std::string text, std::function pressHandler=nullptr, uint8_t flags=BUTTON_BACKGROUND): + TextButton(Window * parent, const rect_t & rect, std::string text, std::function pressHandler = nullptr, uint8_t flags = BUTTON_BACKGROUND): Button(parent, rect, pressHandler, flags), text(std::move(text)) { diff --git a/radio/src/thirdparty/libopenui/src/choice.cpp b/radio/src/thirdparty/libopenui/src/choice.cpp index da77b1b41..9f5d3a5a9 100644 --- a/radio/src/thirdparty/libopenui/src/choice.cpp +++ b/radio/src/thirdparty/libopenui/src/choice.cpp @@ -36,7 +36,6 @@ Choice::Choice(Window * parent, const rect_t & rect, const char * values, int16_ void Choice::paint(BitmapBuffer * dc) { FormField::paint(dc); - theme->drawChoice(dc, this, textHandler ? textHandler(getValue()).c_str() : TEXT_AT_INDEX(values, getValue() - vmin).c_str()); } diff --git a/radio/src/thirdparty/libopenui/src/choice.h b/radio/src/thirdparty/libopenui/src/choice.h index a7f2365e4..ea12c55a2 100644 --- a/radio/src/thirdparty/libopenui/src/choice.h +++ b/radio/src/thirdparty/libopenui/src/choice.h @@ -89,7 +89,8 @@ class Choice : public ChoiceBase { std::function isValueAvailable; std::function textHandler; LcdFlags flags = 0; - void openMenu(); + + virtual void openMenu(); }; #endif // _CHOICE_H_ diff --git a/radio/src/thirdparty/libopenui/src/form.h b/radio/src/thirdparty/libopenui/src/form.h index 20e5713d8..bb6898834 100644 --- a/radio/src/thirdparty/libopenui/src/form.h +++ b/radio/src/thirdparty/libopenui/src/form.h @@ -53,12 +53,12 @@ class FormField: public Window { return current; } - inline FormField * getPreviousField() + virtual FormField * getPreviousField() { return previous; } - inline FormField * getNextField() + virtual FormField * getNextField() { return next; }