From 8c35c3c3d4ea0a5dea3be75928d4cacf87ca6cf6 Mon Sep 17 00:00:00 2001 From: Akseli Lahtinen Date: Mon, 12 Sep 2022 11:22:01 +0300 Subject: add pink color --- src/displayapp/Colors.cpp | 4 +++- src/displayapp/screens/WatchFacePineTimeStyle.cpp | 6 +++--- 2 files changed, 6 insertions(+), 4 deletions(-) (limited to 'src/displayapp') 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(color); Pinetime::Controllers::Settings::Colors nextColor; - if (colorAsInt < 16) { + if (colorAsInt < 17) { nextColor = static_cast(colorAsInt + 1); } else { nextColor = static_cast(0); @@ -594,7 +594,7 @@ Pinetime::Controllers::Settings::Colors WatchFacePineTimeStyle::GetPrevious(Pine if (colorAsInt > 0) { prevColor = static_cast(colorAsInt - 1); } else { - prevColor = static_cast(16); + prevColor = static_cast(17); } return prevColor; -} +} \ No newline at end of file -- cgit v1.2.3