diff options
author | ITCactus <n/a> | 2022-05-25 13:44:25 +0200 |
---|---|---|
committer | ITCactus <n/a> | 2022-06-30 15:15:32 +0200 |
commit | cfaafc1fe2e31926343c571bc22a9afa54287f47 (patch) | |
tree | df2f36033807610ee419f4ef0acebfbf7fc0298c /src/displayapp/screens/settings | |
parent | e7c0b2c5c250f9dc43175bb8d73b2961bfae6b93 (diff) |
fix for week number and days till the end of the year
+ formating (clang)
Diffstat (limited to 'src/displayapp/screens/settings')
-rw-r--r-- | src/displayapp/screens/settings/SettingWatchFace.cpp | 26 |
1 files changed, 10 insertions, 16 deletions
diff --git a/src/displayapp/screens/settings/SettingWatchFace.cpp b/src/displayapp/screens/settings/SettingWatchFace.cpp index 3c88b936..52ea5d9e 100644 --- a/src/displayapp/screens/settings/SettingWatchFace.cpp +++ b/src/displayapp/screens/settings/SettingWatchFace.cpp @@ -17,14 +17,12 @@ SettingWatchFace::SettingWatchFace(Pinetime::Applications::DisplayApp* app, Pine settingsController {settingsController}, screens {app, settingsController.GetWatchfacesMenu(), - { - [this]() -> std::unique_ptr<Screen> { - return CreateScreen1(); - }, - [this]() -> std::unique_ptr<Screen> { - return CreateScreen2(); - } - }, + {[this]() -> std::unique_ptr<Screen> { + return CreateScreen1(); + }, + [this]() -> std::unique_ptr<Screen> { + return CreateScreen2(); + }}, Screens::ScreenListModes::UpDown} { } @@ -39,16 +37,12 @@ bool SettingWatchFace::OnTouchEvent(Pinetime::Applications::TouchEvents event) { std::unique_ptr<Screen> SettingWatchFace::CreateScreen1() { std::array<const char*, 4> watchfaces {" Digital face", " Analog face", " PineTimeStyle", " Terminal"}; - return std::make_unique<Screens::CheckboxList>(0, 2, app, settingsController, title, - symbol, &Controllers::Settings::SetClockFace, - &Controllers::Settings::GetClockFace, - watchfaces); + return std::make_unique<Screens::CheckboxList>( + 0, 2, app, settingsController, title, symbol, &Controllers::Settings::SetClockFace, &Controllers::Settings::GetClockFace, watchfaces); } std::unique_ptr<Screen> SettingWatchFace::CreateScreen2() { std::array<const char*, 4> watchfaces {" Casio G7710", "", "", ""}; - return std::make_unique<Screens::CheckboxList>(1, 2, app, settingsController, title, - symbol, &Controllers::Settings::SetClockFace, - &Controllers::Settings::GetClockFace, - watchfaces); + return std::make_unique<Screens::CheckboxList>( + 1, 2, app, settingsController, title, symbol, &Controllers::Settings::SetClockFace, &Controllers::Settings::GetClockFace, watchfaces); } |