From 7d28e495c26c0daeb8a88f34e108efe940360652 Mon Sep 17 00:00:00 2001 From: sommermorgentraum <24917424+zxkmm@users.noreply.github.com> Date: Wed, 16 Oct 2024 17:35:49 +0800 Subject: [PATCH] workaround for no-touchscreen device (#2301) * just return un-consumed * submodule ver * submodule ver * merge from upstram next * revert submodule ver * revert submodule ver --- firmware/application/ui_navigation.cpp | 6 ++---- hackrf | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/firmware/application/ui_navigation.cpp b/firmware/application/ui_navigation.cpp index a677de6e..a6696b48 100644 --- a/firmware/application/ui_navigation.cpp +++ b/firmware/application/ui_navigation.cpp @@ -996,6 +996,7 @@ void BMPView::paint(Painter&) { bool BMPView::on_touch(const TouchEvent event) { /* the event thing were resolved by HTotoo, talked here https://discord.com/channels/719669764804444213/956561375155589192/1287756910950486027 * the touch screen policy can be better, talked here https://discord.com/channels/719669764804444213/956561375155589192/1198926225897443328 + * this workaround discussed here: https://discord.com/channels/719669764804444213/1170738202924044338/1295630640158478418 */ if (!nav_.is_valid()) { @@ -1004,11 +1005,8 @@ bool BMPView::on_touch(const TouchEvent event) { switch (event.type) { case TouchEvent::Type::Start: - return true; - - case TouchEvent::Type::End: handle_pop(); - return true; + return false; default: break; diff --git a/hackrf b/hackrf index 22c9ff10..d4ed8474 160000 --- a/hackrf +++ b/hackrf @@ -1 +1 @@ -Subproject commit 22c9ff10f934695065b6f79f4d95b812b0ab8365 +Subproject commit d4ed8474e532ccdbf605ee71c0f1fa0557da19e1