summaryrefslogtreecommitdiff
path: root/src/displayapp/screens
diff options
context:
space:
mode:
authorMichele Bini <michele.bini@gmail.com>2022-03-25 22:22:22 (GMT)
committerMichele Bini <michele.bini@gmail.com>2022-03-25 22:22:22 (GMT)
commit268ddbdc7622ab2a6b0490701064ffdde13fee51 (patch)
treeb4a5a240f3df214aa8245f9913fb4a9af8c356a4 /src/displayapp/screens
parent30c319831ab15e6abaf97e4fa8f58a8eaeb8ba4a (diff)
sans animations
Diffstat (limited to 'src/displayapp/screens')
-rw-r--r--src/displayapp/screens/List.cpp2
-rw-r--r--src/displayapp/screens/Notifications.cpp2
-rw-r--r--src/displayapp/screens/ScreenList.h5
-rw-r--r--src/displayapp/screens/Tile.cpp2
-rw-r--r--src/displayapp/screens/settings/QuickSettings.cpp2
5 files changed, 3 insertions, 10 deletions
diff --git a/src/displayapp/screens/List.cpp b/src/displayapp/screens/List.cpp
index af3f30f..47e3a4c 100644
--- a/src/displayapp/screens/List.cpp
+++ b/src/displayapp/screens/List.cpp
@@ -102,7 +102,7 @@ void List::OnButtonEvent(lv_obj_t* object, lv_event_t event) {
if (event == LV_EVENT_CLICKED) {
for (int i = 0; i < MAXLISTITEMS; i++) {
if (apps[i] != Apps::None && object == itemApps[i]) {
- app->StartApp(apps[i], DisplayApp::FullRefreshDirections::Up);
+ app->StartApp(apps[i]);
running = false;
return;
}
diff --git a/src/displayapp/screens/Notifications.cpp b/src/displayapp/screens/Notifications.cpp
index c10a60d..221633d 100644
--- a/src/displayapp/screens/Notifications.cpp
+++ b/src/displayapp/screens/Notifications.cpp
@@ -120,7 +120,6 @@ bool Notifications::OnTouchEvent(Pinetime::Applications::TouchEvents event) {
validDisplay = true;
currentId = previousNotification.id;
currentItem.reset(nullptr);
- app->SetFullRefresh(DisplayApp::FullRefreshDirections::Down);
currentItem = std::make_unique<NotificationItem>(previousNotification.Title(),
previousNotification.Message(),
previousNotification.index,
@@ -146,7 +145,6 @@ bool Notifications::OnTouchEvent(Pinetime::Applications::TouchEvents event) {
validDisplay = true;
currentId = nextNotification.id;
currentItem.reset(nullptr);
- app->SetFullRefresh(DisplayApp::FullRefreshDirections::Up);
currentItem = std::make_unique<NotificationItem>(nextNotification.Title(),
nextNotification.Message(),
nextNotification.index,
diff --git a/src/displayapp/screens/ScreenList.h b/src/displayapp/screens/ScreenList.h
index e316e36..4178704 100644
--- a/src/displayapp/screens/ScreenList.h
+++ b/src/displayapp/screens/ScreenList.h
@@ -37,7 +37,6 @@ namespace Pinetime {
case TouchEvents::SwipeDown:
if (screenIndex > 0) {
current.reset(nullptr);
- app->SetFullRefresh(DisplayApp::FullRefreshDirections::Down);
screenIndex--;
current = screens[screenIndex]();
return true;
@@ -48,7 +47,6 @@ namespace Pinetime {
case TouchEvents::SwipeUp:
if (screenIndex < screens.size() - 1) {
current.reset(nullptr);
- app->SetFullRefresh(DisplayApp::FullRefreshDirections::Up);
screenIndex++;
current = screens[screenIndex]();
}
@@ -61,7 +59,6 @@ namespace Pinetime {
case TouchEvents::SwipeRight:
if (screenIndex > 0) {
current.reset(nullptr);
- app->SetFullRefresh(DisplayApp::FullRefreshDirections::None);
screenIndex--;
current = screens[screenIndex]();
return true;
@@ -72,7 +69,6 @@ namespace Pinetime {
case TouchEvents::SwipeLeft:
if (screenIndex < screens.size() - 1) {
current.reset(nullptr);
- app->SetFullRefresh(DisplayApp::FullRefreshDirections::None);
screenIndex++;
current = screens[screenIndex]();
}
@@ -87,7 +83,6 @@ namespace Pinetime {
screenIndex = 0;
}
current.reset(nullptr);
- app->SetFullRefresh(DisplayApp::FullRefreshDirections::None);
current = screens[screenIndex]();
return true;
}
diff --git a/src/displayapp/screens/Tile.cpp b/src/displayapp/screens/Tile.cpp
index 23d9bca..f33408c 100644
--- a/src/displayapp/screens/Tile.cpp
+++ b/src/displayapp/screens/Tile.cpp
@@ -126,6 +126,6 @@ void Tile::UpdateScreen() {
void Tile::OnValueChangedEvent(lv_obj_t* obj, uint32_t buttonId) {
if(obj != btnm1) return;
- app->StartApp(apps[buttonId], DisplayApp::FullRefreshDirections::Up);
+ app->StartApp(apps[buttonId]);
running = false;
}
diff --git a/src/displayapp/screens/settings/QuickSettings.cpp b/src/displayapp/screens/settings/QuickSettings.cpp
index c00518e..191d587 100644
--- a/src/displayapp/screens/settings/QuickSettings.cpp
+++ b/src/displayapp/screens/settings/QuickSettings.cpp
@@ -149,6 +149,6 @@ void QuickSettings::OnButtonEvent(lv_obj_t* object, lv_event_t event) {
} else if (object == btn4 && event == LV_EVENT_CLICKED) {
running = false;
settingsController.SetSettingsMenu(0);
- app->StartApp(Apps::Settings, DisplayApp::FullRefreshDirections::Up);
+ app->StartApp(Apps::Settings);
}
}