diff options
| author | Kieran Cawthray <kieranc@gmail.com> | 2021-07-23 15:03:28 +0200 |
|---|---|---|
| committer | Kieran Cawthray <kieranc@gmail.com> | 2021-07-23 15:03:28 +0200 |
| commit | 1ddb1f0832b31def410ed5d2f1094e36f389734f (patch) | |
| tree | 48cafce2f13dfcb1456c68a038af8fd38e2604fd /src/displayapp/DisplayApp.cpp | |
| parent | 5e4d3c87e92b8f2dd1020577f3ebad93322b0f6f (diff) | |
| parent | d6cccc2dcd95a7d332ee657d1357ae060389f6e6 (diff) | |
Merge remote-tracking branch 'upstream/develop' into pinetimestyle-colorpicker
Diffstat (limited to 'src/displayapp/DisplayApp.cpp')
| -rw-r--r-- | src/displayapp/DisplayApp.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/displayapp/DisplayApp.cpp b/src/displayapp/DisplayApp.cpp index eb3ebbca..09de611e 100644 --- a/src/displayapp/DisplayApp.cpp +++ b/src/displayapp/DisplayApp.cpp @@ -178,9 +178,13 @@ void DisplayApp::Refresh() { } break; case Messages::TouchEvent: { - if (state != States::Running) + if (state != States::Running) { break; + } auto gesture = OnTouchEvent(); + if (gesture == TouchEvents::None) { + break; + } if (!currentScreen->OnTouchEvent(gesture)) { if (currentApp == Apps::Clock) { switch (gesture) { @@ -287,6 +291,7 @@ void DisplayApp::LoadApp(Apps app, DisplayApp::FullRefreshDirections direction) break; case Apps::FirmwareUpdate: currentScreen = std::make_unique<Screens::FirmwareUpdate>(this, bleController); + ReturnApp(Apps::Clock, FullRefreshDirections::Down, TouchEvents::None); break; case Apps::Notifications: |