diff options
author | Kieran Cawthray <kieranc@gmail.com> | 2021-12-09 22:41:29 +0100 |
---|---|---|
committer | Kieran Cawthray <kieranc@gmail.com> | 2021-12-09 22:41:29 +0100 |
commit | 6cf4a933b6323fc24a3b27ae55a3c12d31d6a841 (patch) | |
tree | ffee2e59a62efe62aa8255f68e7cc89be1cad152 /src/displayapp/screens/settings/SettingTimeFormat.h | |
parent | ae4b9e0f2e877d200bd780f99e2a8952f9f8bf5b (diff) | |
parent | 42a5cdb5b776c2cdeb08a8c6f26606282a809178 (diff) |
Merge remote-tracking branch 'upstream/develop' into pts-settings
Diffstat (limited to 'src/displayapp/screens/settings/SettingTimeFormat.h')
-rw-r--r-- | src/displayapp/screens/settings/SettingTimeFormat.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/displayapp/screens/settings/SettingTimeFormat.h b/src/displayapp/screens/settings/SettingTimeFormat.h index eac4bdc9..818edf0c 100644 --- a/src/displayapp/screens/settings/SettingTimeFormat.h +++ b/src/displayapp/screens/settings/SettingTimeFormat.h @@ -1,7 +1,9 @@ #pragma once +#include <array> #include <cstdint> #include <lvgl/lvgl.h> + #include "components/settings/Settings.h" #include "displayapp/screens/Screen.h" @@ -18,9 +20,9 @@ namespace Pinetime { void UpdateSelected(lv_obj_t* object, lv_event_t event); private: + static constexpr std::array<const char*, 2> options = {" 12-hour", " 24-hour"}; Controllers::Settings& settingsController; - uint8_t optionsTotal; - lv_obj_t* cbOption[2]; + lv_obj_t* cbOption[options.size()]; }; } } |