mirror/The-Powder-Toy
1
0
Fork 0
mirror of https://github.com/The-Powder-Toy/The-Powder-Toy.git synced 2025-08-21 15:41:35 +02:00
Code Issues Projects Releases Wiki Activity

Fix incorrect deco colors being selected

Browse Source
This commit is contained in:
jacob1
2012-09-19 20:53:34 -04:00
committed by Simon Robertshaw
parent d5e322c98d
commit 5ee1c7ff80
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/colourpicker/ColourPickerActivity.cpp
View File

@@ -39,8 +39,6 @@ ColourPickerActivity::ColourPickerActivity(ui::Colour initialColour, ColourPicke
g = format::StringToNumber<int>(a->gValue->GetText()); g = format::StringToNumber<int>(a->gValue->GetText());
b = format::StringToNumber<int>(a->bValue->GetText()); b = format::StringToNumber<int>(a->bValue->GetText());
alpha = format::StringToNumber<int>(a->aValue->GetText()); alpha = format::StringToNumber<int>(a->aValue->GetText());
RGB_to_HSV(r, g, b, &a->currentHue, &a->currentSaturation, &a->currentValue);
if (r > 255) if (r > 255)
r = 255; r = 255;
if (g > 255) if (g > 255)
@@ -49,6 +47,8 @@ ColourPickerActivity::ColourPickerActivity(ui::Colour initialColour, ColourPicke
b = 255; b = 255;
if (alpha > 255) if (alpha > 255)
alpha = 255; alpha = 255;
RGB_to_HSV(r, g, b, &a->currentHue, &a->currentSaturation, &a->currentValue);
a->currentAlpha = alpha; a->currentAlpha = alpha;
a->UpdateTextboxes(r, g, b, alpha); a->UpdateTextboxes(r, g, b, alpha);
} }
@@ -89,7 +89,9 @@ ColourPickerActivity::ColourPickerActivity(ui::Colour initialColour, ColourPicke
void ActionCallback(ui::Button * sender) void ActionCallback(ui::Button * sender)
{ {
int Red, Green, Blue; int Red, Green, Blue;
HSV_to_RGB(a->currentHue, a->currentSaturation, a->currentValue, &Red, &Green, &Blue); Red = format::StringToNumber<int>(a->rValue->GetText());
Green = format::StringToNumber<int>(a->gValue->GetText());
Blue = format::StringToNumber<int>(a->bValue->GetText());
ui::Colour col(Red, Green, Blue, a->currentAlpha); ui::Colour col(Red, Green, Blue, a->currentAlpha);
if(a->callback) if(a->callback)
a->callback->ColourPicked(col); a->callback->ColourPicked(col);