From 3486480f3677fcfbf108aa9bb9c6da33acd6abb0 Mon Sep 17 00:00:00 2001 From: gagarinlg Date: Wed, 9 Feb 2022 13:34:04 +0100 Subject: [PATCH] LVGL rotarty encoder handling updated LVGL rotary encoder handling disabled, to reenable un-comment windowcpp Window::checkEvents the call to lvglPushEncoderEvent --- radio/src/thirdparty/libopenui/src/form.cpp | 10 +++++----- radio/src/thirdparty/libopenui/src/window.cpp | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/radio/src/thirdparty/libopenui/src/form.cpp b/radio/src/thirdparty/libopenui/src/form.cpp index f26f3a608..52c36af1c 100644 --- a/radio/src/thirdparty/libopenui/src/form.cpp +++ b/radio/src/thirdparty/libopenui/src/form.cpp @@ -88,12 +88,12 @@ void FormField::setFocus(uint8_t flag, Window * from) { if (enabled) { Window::setFocus(flag, from); - if(lvobj != nullptr) - { - lv_group_focus_freeze(inputGroup, false); +// if(lvobj != nullptr) +// { +// lv_group_focus_freeze(inputGroup, false); // lv_group_focus_obj(lvobj); - lv_group_focus_freeze(inputGroup, true); - } +// lv_group_focus_freeze(inputGroup, true); +// } } else { if (flag == SET_FOCUS_BACKWARD) { diff --git a/radio/src/thirdparty/libopenui/src/window.cpp b/radio/src/thirdparty/libopenui/src/window.cpp index 0849526b4..d077dd1f5 100644 --- a/radio/src/thirdparty/libopenui/src/window.cpp +++ b/radio/src/thirdparty/libopenui/src/window.cpp @@ -533,7 +533,7 @@ coord_t Window::getSnapStep(coord_t relativeScrollPosition, coord_t pageSize) } #endif -void lvglPushEncoderEvent(event_t evt); +void lvglPushEncoderEvent(event_t& evt); void Window::checkEvents() { auto copy = children; @@ -545,7 +545,7 @@ void Window::checkEvents() if (this == Window::focusWindow) { event_t event = getWindowEvent(); - lvglPushEncoderEvent(event); +// lvglPushEncoderEvent(event); if (event) { this->onEvent(event); }