From 92cb885018585e9a4f79ab49f8a1100ed04dd930 Mon Sep 17 00:00:00 2001 From: kevin koenig Date: Wed, 23 Feb 2022 05:14:35 -0500 Subject: [PATCH] fix issue created when making button lvgl aware. First the lvgl event then the touchEnd event. Deleted touchEnd event code. --- radio/src/thirdparty/libopenui/src/button.cpp | 25 +++++-------------- radio/src/thirdparty/libopenui/src/button.h | 1 - 2 files changed, 6 insertions(+), 20 deletions(-) diff --git a/radio/src/thirdparty/libopenui/src/button.cpp b/radio/src/thirdparty/libopenui/src/button.cpp index 07e165a86..8a6ea8dc6 100644 --- a/radio/src/thirdparty/libopenui/src/button.cpp +++ b/radio/src/thirdparty/libopenui/src/button.cpp @@ -80,30 +80,17 @@ void Button::onEvent(lv_event_t* event) if (enabled && code == LV_EVENT_CLICKED) { onKeyPress(); onPress(); - } - else { -// FormField::onEvent(event); - } -} -#if defined(HARDWARE_TOUCH) -bool Button::onTouchStart(coord_t x, coord_t y) -{ - Window::onTouchStart(x, y); - return true; -} -#endif - -#if defined(HARDWARE_TOUCH) -bool Button::onTouchEnd(coord_t x, coord_t y) -{ - if (enabled) { - onKeyPress(); if (!(windowFlags & NO_FOCUS)) { setFocus(SET_FOCUS_DEFAULT); } - onPress(); } +} + +#if defined(HARDWARE_TOUCH) +// this needs to stay so that viewmain doesnt get the touch event +bool Button::onTouchEnd(coord_t x, coord_t y) +{ return true; } #endif diff --git a/radio/src/thirdparty/libopenui/src/button.h b/radio/src/thirdparty/libopenui/src/button.h index 7d2394cc7..a74f86c8d 100644 --- a/radio/src/thirdparty/libopenui/src/button.h +++ b/radio/src/thirdparty/libopenui/src/button.h @@ -72,7 +72,6 @@ class Button: public FormField void onEvent(lv_event_t* e);// override; #if defined(HARDWARE_TOUCH) - bool onTouchStart(coord_t x, coord_t y) override; bool onTouchEnd(coord_t x, coord_t y) override; #endif