scott/InfiniTime
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases 1 Wiki Activity

Revert "Update GetNext/GetPrevious"

Browse source 
This reverts commit 411c10ec31.
This commit is contained in:
Kieran Cawthray 2021-10-23 18:12:41 +02:00
parent da97a94a0f
commit 85d494a987
1 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/displayapp/screens/PineTimeStyle.cpp
View file

@ -561,13 +561,22 @@ void PineTimeStyle::UpdateSelected(lv_obj_t* object, lv_event_t event) {
Pinetime::Controllers::Settings::Colors PineTimeStyle::GetNext(Pinetime::Controllers::Settings::Colors color) { Pinetime::Controllers::Settings::Colors PineTimeStyle::GetNext(Pinetime::Controllers::Settings::Colors color) {
auto colorAsInt = static_cast<uint8_t>(color); auto colorAsInt = static_cast<uint8_t>(color);
Pinetime::Controllers::Settings::Colors nextColor; Pinetime::Controllers::Settings::Colors nextColor;
nextColor = static_cast<Controllers::Settings::Colors>((colorAsInt + 1) % 17); if (colorAsInt < 16) {
nextColor = static_cast<Controllers::Settings::Colors>(colorAsInt + 1);
} else {
nextColor = static_cast<Controllers::Settings::Colors>(0);
}
return nextColor; return nextColor;
} }
Pinetime::Controllers::Settings::Colors PineTimeStyle::GetPrevious(Pinetime::Controllers::Settings::Colors color) { Pinetime::Controllers::Settings::Colors PineTimeStyle::GetPrevious(Pinetime::Controllers::Settings::Colors color) {
auto colorAsInt = static_cast<uint8_t>(color); auto colorAsInt = static_cast<uint8_t>(color);
Pinetime::Controllers::Settings::Colors prevColor; Pinetime::Controllers::Settings::Colors prevColor;
prevColor = static_cast<Controllers::Settings::Colors>((colorAsInt - 1) % 17);
if (colorAsInt > 0) {
prevColor = static_cast<Controllers::Settings::Colors>(colorAsInt - 1);
} else {
prevColor = static_cast<Controllers::Settings::Colors>(16);
}
return prevColor; return prevColor;
} }