diff options
| author | Akseli Lahtinen <akselmo@akselmo.dev> | 2022-09-12 11:22:01 +0300 |
|---|---|---|
| committer | JF <JF002@users.noreply.github.com> | 2022-09-17 21:32:43 +0200 |
| commit | 8c35c3c3d4ea0a5dea3be75928d4cacf87ca6cf6 (patch) | |
| tree | eb9d788c7e350c1ff76b9fe3b872ee3d85b2602b /src | |
| parent | 809323df3ad6df288f5de03116e7602cb9a8435a (diff) | |
add pink color
Diffstat (limited to 'src')
| -rw-r--r-- | src/components/settings/Settings.h | 5 | ||||
| -rw-r--r-- | src/displayapp/Colors.cpp | 4 | ||||
| -rw-r--r-- | src/displayapp/screens/WatchFacePineTimeStyle.cpp | 6 |
3 files changed, 9 insertions, 6 deletions
diff --git a/src/components/settings/Settings.h b/src/components/settings/Settings.h index 478408f6..c5c94e5a 100644 --- a/src/components/settings/Settings.h +++ b/src/components/settings/Settings.h @@ -34,7 +34,8 @@ namespace Pinetime { Navy, Magenta, Purple, - Orange + Orange, + Pink }; struct PineTimeStyle { Colors ColorTime = Colors::Teal; @@ -245,4 +246,4 @@ namespace Pinetime { void SaveSettingsToFile(); }; } -} +}
\ No newline at end of file diff --git a/src/displayapp/Colors.cpp b/src/displayapp/Colors.cpp index 106c5163..072432ae 100644 --- a/src/displayapp/Colors.cpp +++ b/src/displayapp/Colors.cpp @@ -39,7 +39,9 @@ lv_color_t Pinetime::Applications::Convert(Pinetime::Controllers::Settings::Colo return LV_COLOR_MAKE(0xb0, 0x0, 0xb0); case Pinetime::Controllers::Settings::Colors::Orange: return LV_COLOR_ORANGE; + case Pinetime::Controllers::Settings::Colors::Pink: + return LV_COLOR_MAKE(0xFF, 0xAE, 0xC9); default: return LV_COLOR_WHITE; } -} +}
\ No newline at end of file diff --git a/src/displayapp/screens/WatchFacePineTimeStyle.cpp b/src/displayapp/screens/WatchFacePineTimeStyle.cpp index 0d2e2ab2..2df1c0a2 100644 --- a/src/displayapp/screens/WatchFacePineTimeStyle.cpp +++ b/src/displayapp/screens/WatchFacePineTimeStyle.cpp @@ -579,7 +579,7 @@ void WatchFacePineTimeStyle::UpdateSelected(lv_obj_t* object, lv_event_t event) Pinetime::Controllers::Settings::Colors WatchFacePineTimeStyle::GetNext(Pinetime::Controllers::Settings::Colors color) { auto colorAsInt = static_cast<uint8_t>(color); Pinetime::Controllers::Settings::Colors nextColor; - if (colorAsInt < 16) { + if (colorAsInt < 17) { nextColor = static_cast<Controllers::Settings::Colors>(colorAsInt + 1); } else { nextColor = static_cast<Controllers::Settings::Colors>(0); @@ -594,7 +594,7 @@ Pinetime::Controllers::Settings::Colors WatchFacePineTimeStyle::GetPrevious(Pine if (colorAsInt > 0) { prevColor = static_cast<Controllers::Settings::Colors>(colorAsInt - 1); } else { - prevColor = static_cast<Controllers::Settings::Colors>(16); + prevColor = static_cast<Controllers::Settings::Colors>(17); } return prevColor; -} +}
\ No newline at end of file |