diff --git a/radio/src/thirdparty/libopenui/src/checkbox.cpp b/radio/src/thirdparty/libopenui/src/checkbox.cpp index e2dc3dbd1..0f3480945 100644 --- a/radio/src/thirdparty/libopenui/src/checkbox.cpp +++ b/radio/src/thirdparty/libopenui/src/checkbox.cpp @@ -26,7 +26,6 @@ static void checkbox_event_handler(lv_event_t* e) lv_obj_t* target = lv_event_get_target(e); CheckBox* cb = (CheckBox*)lv_obj_get_user_data(target); - onKeyPress(); if (cb) cb->setValue(lv_obj_get_state(target) & LV_STATE_CHECKED); } diff --git a/radio/src/thirdparty/libopenui/src/choice.cpp b/radio/src/thirdparty/libopenui/src/choice.cpp index 85b13299f..6c72a91b7 100644 --- a/radio/src/thirdparty/libopenui/src/choice.cpp +++ b/radio/src/thirdparty/libopenui/src/choice.cpp @@ -201,7 +201,6 @@ void Choice::setValue(int val) void Choice::onClicked() { - onKeyPress(); openMenu(); } diff --git a/radio/src/thirdparty/libopenui/src/filechoice.cpp b/radio/src/thirdparty/libopenui/src/filechoice.cpp index eb6ef25c6..ea5506bf5 100644 --- a/radio/src/thirdparty/libopenui/src/filechoice.cpp +++ b/radio/src/thirdparty/libopenui/src/filechoice.cpp @@ -134,6 +134,5 @@ bool FileChoice::openMenu() void FileChoice::onClicked() { - onKeyPress(); openMenu(); } diff --git a/radio/src/thirdparty/libopenui/src/libopenui_depends.h b/radio/src/thirdparty/libopenui/src/libopenui_depends.h index 4a9c2800d..414fccf85 100644 --- a/radio/src/thirdparty/libopenui/src/libopenui_depends.h +++ b/radio/src/thirdparty/libopenui/src/libopenui_depends.h @@ -27,10 +27,8 @@ uint16_t* lcdGetScratchBuffer(); void DMACopyBitmap(uint16_t * dest, uint16_t destw, uint16_t desth, uint16_t x, uint16_t y, const uint16_t * src, uint16_t srcw, uint16_t srch, uint16_t srcx, uint16_t srcy, uint16_t w, uint16_t h); void DMACopyAlphaBitmap(uint16_t * dest, uint16_t destw, uint16_t desth, uint16_t x, uint16_t y, const uint16_t * src, uint16_t srcw, uint16_t srch, uint16_t srcx, uint16_t srcy, uint16_t w, uint16_t h); void DMACopyAlphaMask(uint16_t * dest, uint16_t destw, uint16_t desth, uint16_t x, uint16_t y, const uint8_t * src, uint16_t srcw, uint16_t srch, uint16_t srcx, uint16_t srcy, uint16_t w, uint16_t h, uint16_t bg_color); -void onKeyPress(); void onKeyError(); void killEvents(event_t event); -event_t getWindowEvent(); // // These colors MUST be defined diff --git a/radio/src/thirdparty/libopenui/src/menu.cpp b/radio/src/thirdparty/libopenui/src/menu.cpp index befce2fca..52a627683 100644 --- a/radio/src/thirdparty/libopenui/src/menu.cpp +++ b/radio/src/thirdparty/libopenui/src/menu.cpp @@ -118,7 +118,6 @@ void MenuBody::onPress(size_t index) { Menu *menu = getParentMenu(); if (index < lines.size()) { - onKeyPress(); if (menu->multiple) { if (selectedIndex == (int)index) lines[index].onPress(); diff --git a/radio/src/thirdparty/libopenui/src/modal_window.cpp b/radio/src/thirdparty/libopenui/src/modal_window.cpp index 055c4ec0d..2640fea4c 100644 --- a/radio/src/thirdparty/libopenui/src/modal_window.cpp +++ b/radio/src/thirdparty/libopenui/src/modal_window.cpp @@ -42,7 +42,6 @@ void ModalWindow::deleteLater(bool detach, bool trash) void ModalWindow::onClicked() { if (closeWhenClickOutside) { - onKeyPress(); deleteLater(); } } diff --git a/radio/src/thirdparty/libopenui/src/numberedit.cpp b/radio/src/thirdparty/libopenui/src/numberedit.cpp index d2f8e092c..7b1452af6 100644 --- a/radio/src/thirdparty/libopenui/src/numberedit.cpp +++ b/radio/src/thirdparty/libopenui/src/numberedit.cpp @@ -71,7 +71,6 @@ void NumberEdit::onEvent(event_t event) } while (isValueAvailable && !isValueAvailable(value) && value <= vmax); if (value <= vmax) { setValue(value); - onKeyPress(); } else { setValue(vmax); @@ -87,7 +86,6 @@ void NumberEdit::onEvent(event_t event) } while (isValueAvailable && !isValueAvailable(value) && value >= vmin); if (value >= vmin) { setValue(value); - onKeyPress(); } else { setValue(vmin); diff --git a/radio/src/thirdparty/libopenui/src/table.cpp b/radio/src/thirdparty/libopenui/src/table.cpp index 6d0f93f62..7d21c60f0 100644 --- a/radio/src/thirdparty/libopenui/src/table.cpp +++ b/radio/src/thirdparty/libopenui/src/table.cpp @@ -259,11 +259,9 @@ void TableField::selectNext(int16_t dir) void TableField::onEvent(event_t event) { if (event == EVT_ROTARY_RIGHT) { - onKeyPress(); selectNext(1); } else if (event == EVT_ROTARY_LEFT) { - onKeyPress(); selectNext(-1); } else {