CCF_100/InfiniTime
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'upstream/develop' into pinetimestyle-colorpicker

Browse Source
This commit is contained in:
Kieran Cawthray
2021-07-23 15:03:28 +02:00
parent 5e4d3c87e9 d6cccc2dcd
commit 1ddb1f0832
6 changed files with 53 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/displayapp/DisplayApp.cpp
View File

@@ -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: