summaryrefslogtreecommitdiff
path: root/src/displayapp/DisplayApp.cpp
diff options
context:
space:
mode:
authorMichele Bini <michele.bini@gmail.com>2022-03-31 13:40:02 (GMT)
committerMichele Bini <michele.bini@gmail.com>2022-03-31 13:40:02 (GMT)
commit92ce5ee9751f01dc63330ad25910c674420cd984 (patch)
tree3a373058774b12dcad5673f7cc116493e25282aa /src/displayapp/DisplayApp.cpp
parent99321f0cd3181d4cd6a00f69cd9b554c63c52849 (diff)
.
Diffstat (limited to 'src/displayapp/DisplayApp.cpp')
-rw-r--r--src/displayapp/DisplayApp.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/displayapp/DisplayApp.cpp b/src/displayapp/DisplayApp.cpp
index 5a250b5..30b86ed 100644
--- a/src/displayapp/DisplayApp.cpp
+++ b/src/displayapp/DisplayApp.cpp
@@ -196,7 +196,7 @@ void DisplayApp::Refresh() {
auto* alarm = static_cast<Screens::Alarm*>(currentScreen.get());
alarm->SetAlerting();
} else {
- LoadApp(Apps::Alarm);
+ LoadApp(Apps::Alarm, DisplayApp::FullRefreshDirections::None);
}
break;
case Messages::TouchEvent: {
@@ -279,14 +279,14 @@ void DisplayApp::Refresh() {
}
}
+ if (touchHandler.IsTouching()) {
+ currentScreen->OnTouchEvent(touchHandler.GetX(), touchHandler.GetY());
+ }
+
if (nextApp != Apps::None) {
LoadApp(nextApp, nextDirection);
nextApp = Apps::None;
}
-
- if (touchHandler.IsTouching()) {
- currentScreen->OnTouchEvent(touchHandler.GetX(), touchHandler.GetY());
- }
}
void DisplayApp::StartApp(Apps app, DisplayApp::FullRefreshDirections direction) {