Git-Mirrors/portapack-mayhem
1
0
Fork 0
mirror of https://github.com/eried/portapack-mayhem.git synced 2025-11-30 16:36:40 -05:00
Code Issues Projects Releases Packages Wiki Activity

resolve conflicts merge

Browse source
This commit is contained in:
gullradriel 2025-11-07 21:36:41 +01:00 • committed by GitHub
parent fd7637187a
commit 344aa0c741
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 26 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
firmware/common/ui_widget.hpp
View file

@ -994,6 +994,10 @@ class Waveform : public Widget {
void set_paused(bool paused);
bool is_clickable() const;
bool is_paused() const;
void set_paused(bool paused);
bool is_clickable() const;
void paint(Painter& painter) override;
bool on_key(const KeyEvent key) override;
bool on_touch(const TouchEvent event) override;