CheckboxList : fix formatting.
This commit is contained in:
parent
4ec49bde8a
commit
8c7be1fbb1
|
@ -17,12 +17,9 @@ CheckboxList::CheckboxList(const uint8_t screenID,
|
|||
const char* optionsTitle,
|
||||
const char* optionsSymbol,
|
||||
uint32_t originalValue,
|
||||
std::function<void(uint32_t)>OnValueChanged,
|
||||
std::function<void(uint32_t)> OnValueChanged,
|
||||
std::array<const char*, MaxItems> options)
|
||||
: Screen(app),
|
||||
screenID {screenID},
|
||||
OnValueChanged{std::move(OnValueChanged)},
|
||||
options {options}, value {originalValue} {
|
||||
: Screen(app), screenID {screenID}, OnValueChanged {std::move(OnValueChanged)}, options {options}, value {originalValue} {
|
||||
// Set the background to Black
|
||||
lv_obj_set_style_local_bg_color(lv_scr_act(), LV_OBJ_PART_MAIN, LV_STATE_DEFAULT, LV_COLOR_BLACK);
|
||||
|
||||
|
|
|
@ -20,14 +20,14 @@ namespace Pinetime {
|
|||
const char* optionsTitle,
|
||||
const char* optionsSymbol,
|
||||
uint32_t originalValue,
|
||||
std::function<void(uint32_t)>OnValueChanged,
|
||||
std::function<void(uint32_t)> OnValueChanged,
|
||||
std::array<const char*, MaxItems> options);
|
||||
~CheckboxList() override;
|
||||
void UpdateSelected(lv_obj_t* object, lv_event_t event);
|
||||
|
||||
private:
|
||||
const uint8_t screenID;
|
||||
std::function<void(uint32_t)>OnValueChanged;
|
||||
std::function<void(uint32_t)> OnValueChanged;
|
||||
std::array<const char*, MaxItems> options;
|
||||
std::array<lv_obj_t*, MaxItems> cbOption;
|
||||
std::array<lv_point_t, 2> pageIndicatorBasePoints;
|
||||
|
|
|
@ -34,30 +34,32 @@ 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,
|
||||
title,
|
||||
symbol,
|
||||
settingsController.GetClockFace(),
|
||||
[&settings = settingsController](uint32_t clockFace) {
|
||||
settings.SetClockFace(clockFace);
|
||||
settings.SaveSettings();
|
||||
},
|
||||
watchfaces);
|
||||
return std::make_unique<Screens::CheckboxList>(
|
||||
0,
|
||||
2,
|
||||
app,
|
||||
title,
|
||||
symbol,
|
||||
settingsController.GetClockFace(),
|
||||
[&settings = settingsController](uint32_t clockFace) {
|
||||
settings.SetClockFace(clockFace);
|
||||
settings.SaveSettings();
|
||||
},
|
||||
watchfaces);
|
||||
}
|
||||
|
||||
std::unique_ptr<Screen> SettingWatchFace::CreateScreen2() {
|
||||
std::array<const char*, 4> watchfaces {"Infineat face", "Casio G7710", "", ""};
|
||||
return std::make_unique<Screens::CheckboxList>(1,
|
||||
2,
|
||||
app,
|
||||
title,
|
||||
symbol,
|
||||
settingsController.GetClockFace(),
|
||||
[&settings = settingsController](uint32_t clockFace) {
|
||||
settings.SetClockFace(clockFace);
|
||||
settings.SaveSettings();
|
||||
},
|
||||
watchfaces);
|
||||
return std::make_unique<Screens::CheckboxList>(
|
||||
1,
|
||||
2,
|
||||
app,
|
||||
title,
|
||||
symbol,
|
||||
settingsController.GetClockFace(),
|
||||
[&settings = settingsController](uint32_t clockFace) {
|
||||
settings.SetClockFace(clockFace);
|
||||
settings.SaveSettings();
|
||||
},
|
||||
watchfaces);
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue
Block a user