Git-Mirrors/portapack-mayhem
1
0
Fork 0
mirror of https://github.com/eried/portapack-mayhem.git synced 2024-10-01 01:26:06 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix for the freezing when no on_touch_release function

Browse Source
This commit is contained in:
Erwin Ried 2020-09-25 03:34:05 +02:00
parent 883a62238d
commit f3503e6844
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
firmware/common/ui_widget.cpp
View File

@ -913,12 +913,12 @@ bool Button::on_touch(const TouchEvent event) {
case TouchEvent::Type::End: case TouchEvent::Type::End:
set_highlighted(false); set_highlighted(false);
set_dirty(); set_dirty();
if( on_select && !instant_exec_ ) {
on_select(*this);
}
if( on_touch_release) { if( on_touch_release) {
on_touch_release(*this); on_touch_release(*this);
} }
if( on_select && !instant_exec_ ) {
on_select(*this);
}
return true; return true;
default: default:

4
firmware/common/ui_widget.hpp
View File

@ -378,8 +378,8 @@ private:
class Button : public Widget { class Button : public Widget {
public: public:
std::function<void(Button&)> on_select { }; std::function<void(Button&)> on_select { };
std::function<void(Button&)> on_touch_release { nullptr }; // Executed when releasing touch, after on_select. std::function<void(Button&)> on_touch_release { }; // Executed when releasing touch, after on_select.
std::function<void(Button&)> on_touch_press { nullptr }; // Executed when touching, before on_select. std::function<void(Button&)> on_touch_press { }; // Executed when touching, before on_select.
std::function<bool(Button&, KeyEvent)> on_dir { }; std::function<bool(Button&, KeyEvent)> on_dir { };
std::function<void(Button&)> on_highlight { }; std::function<void(Button&)> on_highlight { };