diff options
| author | Riku Isokoski <riksu9000@gmail.com> | 2021-07-23 19:56:00 (GMT) |
|---|---|---|
| committer | Riku Isokoski <riksu9000@gmail.com> | 2021-07-23 19:56:00 (GMT) |
| commit | fc93bdbbbac9b19530db18f17817ffe2c17260c4 (patch) | |
| tree | de7f5dc57797b26393581502acdf53d8098286e6 /src/displayapp/DisplayApp.cpp | |
| parent | 331fc2be6931238960c894d0a926f673607455fc (diff) | |
| parent | 0a0f28fff4be4c9fd9030d9375459fb7b5fdd004 (diff) | |
Merge branch 'develop' into refresh_rework
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 450833f..90ffbdf 100644 --- a/src/displayapp/DisplayApp.cpp +++ b/src/displayapp/DisplayApp.cpp @@ -177,9 +177,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) { @@ -286,6 +290,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: |