ColorSelection.cpp -> RGBSelection.cpp.

This commit is contained in:
StackZ
2020-07-15 20:51:17 +02:00
parent a145c20a91
commit dc64c2e2a7
3 changed files with 14 additions and 14 deletions
+1 -1
View File
@@ -30,7 +30,7 @@
#include "common.hpp" #include "common.hpp"
namespace Overlays { namespace Overlays {
u32 SelectColor(u32 oldColor); u32 SelectRGB(u32 oldColor);
} }
#endif #endif
@@ -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 r = ColorHelper::getColorValue(oldColor, 2);
u8 g = ColorHelper::getColorValue(oldColor, 1); u8 g = ColorHelper::getColorValue(oldColor, 1);
u8 b = ColorHelper::getColorValue(oldColor, 0); u8 b = ColorHelper::getColorValue(oldColor, 0);
+12 -12
View File
@@ -498,40 +498,40 @@ void Settings::colorChanging(u32 hDown, u32 hHeld, touchPosition touch) {
if (hDown & KEY_A) { if (hDown & KEY_A) {
switch(this->colorMode) { switch(this->colorMode) {
case 0: case 0:
config->barColor(Overlays::SelectColor(config->barColor())); config->barColor(Overlays::SelectRGB(config->barColor()));
break; break;
case 1: case 1:
config->topBG(Overlays::SelectColor(config->topBG())); config->topBG(Overlays::SelectRGB(config->topBG()));
break; break;
case 2: case 2:
config->bottomBG(Overlays::SelectColor(config->bottomBG())); config->bottomBG(Overlays::SelectRGB(config->bottomBG()));
break; break;
case 3: case 3:
config->textColor(Overlays::SelectColor(config->textColor())); config->textColor(Overlays::SelectRGB(config->textColor()));
break; break;
case 4: case 4:
config->selectedColor(Overlays::SelectColor(config->selectedColor())); config->selectedColor(Overlays::SelectRGB(config->selectedColor()));
break; break;
case 5: case 5:
config->unselectedColor(Overlays::SelectColor(config->unselectedColor())); config->unselectedColor(Overlays::SelectRGB(config->unselectedColor()));
break; break;
case 6: case 6:
config->progressbarColor(Overlays::SelectColor(config->progressbarColor())); config->progressbarColor(Overlays::SelectRGB(config->progressbarColor()));
break; break;
case 7: case 7:
config->notfoundColor(Overlays::SelectColor(config->notfoundColor())); config->notfoundColor(Overlays::SelectRGB(config->notfoundColor()));
break; break;
case 8: case 8:
config->outdatedColor(Overlays::SelectColor(config->outdatedColor())); config->outdatedColor(Overlays::SelectRGB(config->outdatedColor()));
break; break;
case 9: case 9:
config->uptodateColor(Overlays::SelectColor(config->uptodateColor())); config->uptodateColor(Overlays::SelectRGB(config->uptodateColor()));
break; break;
case 10: case 10:
config->futureColor(Overlays::SelectColor(config->futureColor())); config->futureColor(Overlays::SelectRGB(config->futureColor()));
break; break;
case 11: case 11:
config->buttonColor(Overlays::SelectColor(config->buttonColor())); config->buttonColor(Overlays::SelectRGB(config->buttonColor()));
break; break;
} }
} }