pinetime/InfiniTime
1
0
Fork 0
Code Activity

Fix settings merge error

Browse source
This commit is contained in:
Kieran Cawthray 2021-10-18 23:29:41 +02:00
parent ff1fce18d6
commit 1c3372b319
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/displayapp/screens/settings/Settings.cpp
View file

@ -18,6 +18,9 @@ Settings::Settings(Pinetime::Applications::DisplayApp* app, Pinetime::Controller
}, },
[this]() -> std::unique_ptr<Screen> { [this]() -> std::unique_ptr<Screen> {
return CreateScreen2(); return CreateScreen2();
},
[this]() -> std::unique_ptr<Screen> {
return CreateScreen3();
}}, }},
Screens::ScreenListModes::UpDown} { Screens::ScreenListModes::UpDown} {
} }
@ -39,7 +42,7 @@ std::unique_ptr<Screen> Settings::CreateScreen1() {
{Symbols::home, "Watch face", Apps::SettingWatchFace}, {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() { std::unique_ptr<Screen> Settings::CreateScreen2() {
@ -63,5 +66,5 @@ std::unique_ptr<Screen> Settings::CreateScreen3() {
{Symbols::none, "None", Apps::None} {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);
} }