diff options
| author | Michele Bini <michele.bini@gmail.com> | 2022-03-24 03:29:32 (GMT) |
|---|---|---|
| committer | Michele Bini <michele.bini@gmail.com> | 2022-03-24 03:29:32 (GMT) |
| commit | 9a4fef636caf96d6dbcf91dc7ac790092cdcfba9 (patch) | |
| tree | 503d02e73ac7fa1f44ac447ec88ae45a88142a46 /src/displayapp/screens/settings | |
| parent | aa32220d919c4d9eac9f85c3ed6c636f0400aec3 (diff) | |
Revert "Analog24 watchface"
This reverts commit a62b893469765923a113acdf85627ce39322880f.
Diffstat (limited to 'src/displayapp/screens/settings')
| -rw-r--r-- | src/displayapp/screens/settings/SettingWatchFace.cpp | 4 | ||||
| -rw-r--r-- | src/displayapp/screens/settings/SettingWatchFace.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/displayapp/screens/settings/SettingWatchFace.cpp b/src/displayapp/screens/settings/SettingWatchFace.cpp index 9e2748c..5008592 100644 --- a/src/displayapp/screens/settings/SettingWatchFace.cpp +++ b/src/displayapp/screens/settings/SettingWatchFace.cpp @@ -14,7 +14,7 @@ namespace { } } -constexpr std::array<const char*, 5> SettingWatchFace::options; +constexpr std::array<const char*, 4> SettingWatchFace::options; SettingWatchFace::SettingWatchFace(Pinetime::Applications::DisplayApp* app, Pinetime::Controllers::Settings& settingsController) : Screen(app), settingsController {settingsController} { @@ -27,7 +27,7 @@ SettingWatchFace::SettingWatchFace(Pinetime::Applications::DisplayApp* app, Pine lv_obj_set_style_local_pad_inner(container1, LV_CONT_PART_MAIN, LV_STATE_DEFAULT, 5); lv_obj_set_style_local_border_width(container1, LV_CONT_PART_MAIN, LV_STATE_DEFAULT, 0); - lv_obj_set_pos(container1, 10, 50); + lv_obj_set_pos(container1, 10, 60); lv_obj_set_width(container1, LV_HOR_RES - 20); lv_obj_set_height(container1, LV_VER_RES - 50); lv_cont_set_layout(container1, LV_LAYOUT_COLUMN_LEFT); diff --git a/src/displayapp/screens/settings/SettingWatchFace.h b/src/displayapp/screens/settings/SettingWatchFace.h index 37ea62b..62427b4 100644 --- a/src/displayapp/screens/settings/SettingWatchFace.h +++ b/src/displayapp/screens/settings/SettingWatchFace.h @@ -20,7 +20,7 @@ namespace Pinetime { void UpdateSelected(lv_obj_t* object, lv_event_t event); private: - static constexpr std::array<const char*, 5> options = {" Digital face", " Analog face", " 24H Analog", " PineTimeStyle", " Terminal"}; + static constexpr std::array<const char*, 4> options = {" Digital face", " Analog face", " PineTimeStyle", " Terminal"}; Controllers::Settings& settingsController; lv_obj_t* cbOption[options.size()]; |
