From ed664773b4a7ea3f525e036b81c3b75373746eb1 Mon Sep 17 00:00:00 2001 From: Bertrand Songis Date: Fri, 13 Dec 2019 22:11:05 +0100 Subject: [PATCH] Allow to call forwardTouchEnd from children classes --- radio/src/thirdparty/libopenui/src/window.cpp | 9 +++++++-- radio/src/thirdparty/libopenui/src/window.h | 2 ++ 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/radio/src/thirdparty/libopenui/src/window.cpp b/radio/src/thirdparty/libopenui/src/window.cpp index 8ecb8e22c..328b0479a 100644 --- a/radio/src/thirdparty/libopenui/src/window.cpp +++ b/radio/src/thirdparty/libopenui/src/window.cpp @@ -336,7 +336,7 @@ bool Window::onTouchStart(coord_t x, coord_t y) return false; } -bool Window::onTouchEnd(coord_t x, coord_t y) +bool Window::forwardTouchEnd(coord_t x, coord_t y) { for (auto it = children.rbegin(); it != children.rend(); ++it) { auto child = *it; @@ -347,7 +347,12 @@ bool Window::onTouchEnd(coord_t x, coord_t y) } } - return windowFlags & OPAQUE; + return false; +} + +bool Window::onTouchEnd(coord_t x, coord_t y) +{ + return forwardTouchEnd(x, y) ? true : (windowFlags & OPAQUE); } bool Window::onTouchSlide(coord_t x, coord_t y, coord_t startX, coord_t startY, coord_t slideX, coord_t slideY) diff --git a/radio/src/thirdparty/libopenui/src/window.h b/radio/src/thirdparty/libopenui/src/window.h index 93a421259..3e1715a60 100644 --- a/radio/src/thirdparty/libopenui/src/window.h +++ b/radio/src/thirdparty/libopenui/src/window.h @@ -376,6 +376,8 @@ class Window { virtual bool onTouchSlide(coord_t x, coord_t y, coord_t startX, coord_t startY, coord_t slideX, coord_t slideY); #endif + + bool forwardTouchEnd(coord_t x, coord_t y); }; #endif // _WINDOW_H_