summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorKieran Cawthray <kieranc@gmail.com>2021-10-18 23:29:41 +0200
committerKieran Cawthray <kieranc@gmail.com>2021-10-18 23:29:41 +0200
commit1c3372b3195168897a0d563690df302848d32f86 (patch)
tree30c7249d1c0e64a461dae27da84ffb2780130133 /src
parentff1fce18d6188d8b23374613f07e281173f228e7 (diff)
Fix settings merge error
Diffstat (limited to 'src')
-rw-r--r--src/displayapp/screens/settings/Settings.cpp7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/displayapp/screens/settings/Settings.cpp b/src/displayapp/screens/settings/Settings.cpp
index 46fa50ab..2d05ddeb 100644
--- a/src/displayapp/screens/settings/Settings.cpp
+++ b/src/displayapp/screens/settings/Settings.cpp
@@ -18,6 +18,9 @@ Settings::Settings(Pinetime::Applications::DisplayApp* app, Pinetime::Controller
},
[this]() -> std::unique_ptr<Screen> {
return CreateScreen2();
+ },
+ [this]() -> std::unique_ptr<Screen> {
+ return CreateScreen3();
}},
Screens::ScreenListModes::UpDown} {
}
@@ -39,7 +42,7 @@ std::unique_ptr<Screen> Settings::CreateScreen1() {
{Symbols::home, "Watch face", Apps::SettingWatchFace},
}};
- return std::make_unique<Screens::List>(0, 2, app, settingsController, applications);
+ return std::make_unique<Screens::List>(0, 3, app, settingsController, applications);
}
std::unique_ptr<Screen> Settings::CreateScreen2() {
@@ -63,5 +66,5 @@ std::unique_ptr<Screen> Settings::CreateScreen3() {
{Symbols::none, "None", Apps::None}
}};
- return std::make_unique<Screens::List>(1, 2, app, settingsController, applications);
+ return std::make_unique<Screens::List>(2, 3, app, settingsController, applications);
} \ No newline at end of file