diff options
| author | Jean-François Milants <jf@codingfield.com> | 2021-04-09 20:47:24 +0200 |
|---|---|---|
| committer | Jean-François Milants <jf@codingfield.com> | 2021-04-09 20:47:24 +0200 |
| commit | 63584b6561cbc31095354b06e356f700dcf0e32b (patch) | |
| tree | b8ee17d8bfdc57c3b80b7c918f3431d198939856 /src/displayapp/screens/Twos.h | |
| parent | 3934e9bef20c5c2ad393e20cfff3a5a1b0d24569 (diff) | |
| parent | 9096d1db4c6be9f4a2cc8af99a994c219f25108c (diff) | |
Merge branch 'develop' into notification-title
# Conflicts:
# src/displayapp/screens/Notifications.cpp
Diffstat (limited to 'src/displayapp/screens/Twos.h')
| -rw-r--r-- | src/displayapp/screens/Twos.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/displayapp/screens/Twos.h b/src/displayapp/screens/Twos.h index ec021971..7223c7a8 100644 --- a/src/displayapp/screens/Twos.h +++ b/src/displayapp/screens/Twos.h @@ -15,7 +15,7 @@ namespace Pinetime { Twos(DisplayApp* app); ~Twos() override; bool Refresh() override; - bool OnButtonPushed() override; + bool OnTouchEvent(TouchEvents event) override; private: @@ -26,7 +26,7 @@ namespace Pinetime { lv_style_t style_cell4; lv_style_t style_cell5; - bool running = true; + lv_obj_t *scoreText; lv_obj_t *gridDisplay; Tile grid[4][4]; |