From dc64c2e2a7ee391463a0baa54a886a55b96df762 Mon Sep 17 00:00:00 2001 From: StackZ <47382115+SuperSaiyajinStackZ@users.noreply.github.com> Date: Wed, 15 Jul 2020 20:51:17 +0200 Subject: [PATCH] ColorSelection.cpp -> RGBSelection.cpp. --- include/overlays/overlay.hpp | 2 +- .../{ColorSelection.cpp => RGBSelection.cpp} | 2 +- source/screens/settings.cpp | 24 +++++++++---------- 3 files changed, 14 insertions(+), 14 deletions(-) rename source/overlays/{ColorSelection.cpp => RGBSelection.cpp} (99%) diff --git a/include/overlays/overlay.hpp b/include/overlays/overlay.hpp index 861385c..e4b2177 100644 --- a/include/overlays/overlay.hpp +++ b/include/overlays/overlay.hpp @@ -30,7 +30,7 @@ #include "common.hpp" namespace Overlays { - u32 SelectColor(u32 oldColor); + u32 SelectRGB(u32 oldColor); } #endif \ No newline at end of file diff --git a/source/overlays/ColorSelection.cpp b/source/overlays/RGBSelection.cpp similarity index 99% rename from source/overlays/ColorSelection.cpp rename to source/overlays/RGBSelection.cpp index 29f5734..ef96963 100644 --- a/source/overlays/ColorSelection.cpp +++ b/source/overlays/RGBSelection.cpp @@ -84,7 +84,7 @@ static void Draw(u8 r, u8 g, u8 b) { } -u32 Overlays::SelectColor(u32 oldColor) { +u32 Overlays::SelectRGB(u32 oldColor) { u8 r = ColorHelper::getColorValue(oldColor, 2); u8 g = ColorHelper::getColorValue(oldColor, 1); u8 b = ColorHelper::getColorValue(oldColor, 0); diff --git a/source/screens/settings.cpp b/source/screens/settings.cpp index 955c3de..9679b33 100644 --- a/source/screens/settings.cpp +++ b/source/screens/settings.cpp @@ -498,40 +498,40 @@ void Settings::colorChanging(u32 hDown, u32 hHeld, touchPosition touch) { if (hDown & KEY_A) { switch(this->colorMode) { case 0: - config->barColor(Overlays::SelectColor(config->barColor())); + config->barColor(Overlays::SelectRGB(config->barColor())); break; case 1: - config->topBG(Overlays::SelectColor(config->topBG())); + config->topBG(Overlays::SelectRGB(config->topBG())); break; case 2: - config->bottomBG(Overlays::SelectColor(config->bottomBG())); + config->bottomBG(Overlays::SelectRGB(config->bottomBG())); break; case 3: - config->textColor(Overlays::SelectColor(config->textColor())); + config->textColor(Overlays::SelectRGB(config->textColor())); break; case 4: - config->selectedColor(Overlays::SelectColor(config->selectedColor())); + config->selectedColor(Overlays::SelectRGB(config->selectedColor())); break; case 5: - config->unselectedColor(Overlays::SelectColor(config->unselectedColor())); + config->unselectedColor(Overlays::SelectRGB(config->unselectedColor())); break; case 6: - config->progressbarColor(Overlays::SelectColor(config->progressbarColor())); + config->progressbarColor(Overlays::SelectRGB(config->progressbarColor())); break; case 7: - config->notfoundColor(Overlays::SelectColor(config->notfoundColor())); + config->notfoundColor(Overlays::SelectRGB(config->notfoundColor())); break; case 8: - config->outdatedColor(Overlays::SelectColor(config->outdatedColor())); + config->outdatedColor(Overlays::SelectRGB(config->outdatedColor())); break; case 9: - config->uptodateColor(Overlays::SelectColor(config->uptodateColor())); + config->uptodateColor(Overlays::SelectRGB(config->uptodateColor())); break; case 10: - config->futureColor(Overlays::SelectColor(config->futureColor())); + config->futureColor(Overlays::SelectRGB(config->futureColor())); break; case 11: - config->buttonColor(Overlays::SelectColor(config->buttonColor())); + config->buttonColor(Overlays::SelectRGB(config->buttonColor())); break; } }