diff --git a/firmware/application/apps/ui_standalone_view.cpp b/firmware/application/apps/ui_standalone_view.cpp index fc1044c6e..33ab46486 100644 --- a/firmware/application/apps/ui_standalone_view.cpp +++ b/firmware/application/apps/ui_standalone_view.cpp @@ -285,9 +285,9 @@ bool StandaloneView::on_encoder(const EncoderEvent event) { bool StandaloneView::on_touch(const TouchEvent event) { if (get_application_information()->header_version > 1) { - get_application_information()->OnTouchEvent(event.point.x(), event.point.y(), (uint32_t)event.type); + return get_application_information()->OnTouchEvent(event.point.x(), event.point.y(), (uint32_t)event.type); } - return true; + return false; } bool StandaloneView::on_keyboard(const KeyboardEvent event) { diff --git a/firmware/common/standalone_app.hpp b/firmware/common/standalone_app.hpp index f2c34c19d..22c42fbf0 100644 --- a/firmware/common/standalone_app.hpp +++ b/firmware/common/standalone_app.hpp @@ -148,7 +148,7 @@ struct standalone_application_information_t { void (*shutdown)(); void (*PaintViewMirror)(); - void (*OnTouchEvent)(int x, int y, uint32_t type); + bool (*OnTouchEvent)(int x, int y, uint32_t type); void (*OnFocus)(); bool (*OnKeyEvent)(uint8_t key); bool (*OnEncoder)(int32_t delta); diff --git a/firmware/standalone/digitalrain/digitalrain.cpp b/firmware/standalone/digitalrain/digitalrain.cpp index dd1864cd0..d7a232130 100644 --- a/firmware/standalone/digitalrain/digitalrain.cpp +++ b/firmware/standalone/digitalrain/digitalrain.cpp @@ -77,7 +77,7 @@ ui::Widget* touch_widget(ui::Widget* const w, ui::TouchEvent event) { ui::Widget* captured_widget{nullptr}; -void OnTouchEvent(int, int, uint32_t) { +bool OnTouchEvent(int, int, uint32_t) { if (standaloneViewMirror) { _api->exit_app(); /* //left here for example, but not used in digital rain @@ -96,6 +96,7 @@ void OnTouchEvent(int, int, uint32_t) { captured_widget->on_touch(event); */ } + return false; } void OnFocus() { diff --git a/firmware/standalone/digitalrain/digitalrain.hpp b/firmware/standalone/digitalrain/digitalrain.hpp index 434ba05e1..18100971e 100644 --- a/firmware/standalone/digitalrain/digitalrain.hpp +++ b/firmware/standalone/digitalrain/digitalrain.hpp @@ -40,7 +40,7 @@ void shutdown(); void OnFocus(); bool OnKeyEvent(uint8_t); bool OnEncoder(int32_t); -void OnTouchEvent(int, int, uint32_t); +bool OnTouchEvent(int, int, uint32_t); bool OnKeyboad(uint8_t); void PaintViewMirror(); diff --git a/firmware/standalone/pacman/main.cpp b/firmware/standalone/pacman/main.cpp index 8204f2302..d8dd88479 100644 --- a/firmware/standalone/pacman/main.cpp +++ b/firmware/standalone/pacman/main.cpp @@ -23,7 +23,7 @@ #include "pacman.hpp" #include -void notouch(int, int, uint32_t) { +bool notouch(int, int, uint32_t) { // do nothing } void nothing() {