mirror of
https://github.com/portapack-mayhem/mayhem-firmware.git
synced 2026-09-12 01:29:29 +00:00
Refactor OnTouchEvent functions to return boolean values for better event handling (#2854)
This commit is contained in:
@@ -285,9 +285,9 @@ bool StandaloneView::on_encoder(const EncoderEvent event) {
|
|||||||
|
|
||||||
bool StandaloneView::on_touch(const TouchEvent event) {
|
bool StandaloneView::on_touch(const TouchEvent event) {
|
||||||
if (get_application_information()->header_version > 1) {
|
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) {
|
bool StandaloneView::on_keyboard(const KeyboardEvent event) {
|
||||||
|
|||||||
@@ -148,7 +148,7 @@ struct standalone_application_information_t {
|
|||||||
void (*shutdown)();
|
void (*shutdown)();
|
||||||
|
|
||||||
void (*PaintViewMirror)();
|
void (*PaintViewMirror)();
|
||||||
void (*OnTouchEvent)(int x, int y, uint32_t type);
|
bool (*OnTouchEvent)(int x, int y, uint32_t type);
|
||||||
void (*OnFocus)();
|
void (*OnFocus)();
|
||||||
bool (*OnKeyEvent)(uint8_t key);
|
bool (*OnKeyEvent)(uint8_t key);
|
||||||
bool (*OnEncoder)(int32_t delta);
|
bool (*OnEncoder)(int32_t delta);
|
||||||
|
|||||||
@@ -77,7 +77,7 @@ ui::Widget* touch_widget(ui::Widget* const w, ui::TouchEvent event) {
|
|||||||
|
|
||||||
ui::Widget* captured_widget{nullptr};
|
ui::Widget* captured_widget{nullptr};
|
||||||
|
|
||||||
void OnTouchEvent(int, int, uint32_t) {
|
bool OnTouchEvent(int, int, uint32_t) {
|
||||||
if (standaloneViewMirror) {
|
if (standaloneViewMirror) {
|
||||||
_api->exit_app();
|
_api->exit_app();
|
||||||
/* //left here for example, but not used in digital rain
|
/* //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);
|
captured_widget->on_touch(event);
|
||||||
*/
|
*/
|
||||||
}
|
}
|
||||||
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
void OnFocus() {
|
void OnFocus() {
|
||||||
|
|||||||
@@ -40,7 +40,7 @@ void shutdown();
|
|||||||
void OnFocus();
|
void OnFocus();
|
||||||
bool OnKeyEvent(uint8_t);
|
bool OnKeyEvent(uint8_t);
|
||||||
bool OnEncoder(int32_t);
|
bool OnEncoder(int32_t);
|
||||||
void OnTouchEvent(int, int, uint32_t);
|
bool OnTouchEvent(int, int, uint32_t);
|
||||||
bool OnKeyboad(uint8_t);
|
bool OnKeyboad(uint8_t);
|
||||||
void PaintViewMirror();
|
void PaintViewMirror();
|
||||||
|
|
||||||
|
|||||||
@@ -23,7 +23,7 @@
|
|||||||
#include "pacman.hpp"
|
#include "pacman.hpp"
|
||||||
#include <memory>
|
#include <memory>
|
||||||
|
|
||||||
void notouch(int, int, uint32_t) {
|
bool notouch(int, int, uint32_t) {
|
||||||
// do nothing
|
// do nothing
|
||||||
}
|
}
|
||||||
void nothing() {
|
void nothing() {
|
||||||
|
|||||||
Reference in New Issue
Block a user