diff options
| author | jacob1 <jfu614@gmail.com> | 2012-09-20 00:53:34 (GMT) |
|---|---|---|
| committer | Simon Robertshaw <simon@hardwired.org.uk> | 2012-09-25 19:08:33 (GMT) |
| commit | 5ee1c7ff801b475b4447c5ee6db4a77d0f75f532 (patch) | |
| tree | bbdb8e73c0935d721e20d6db211ed3aa80f7fa38 /src/colourpicker/ColourPickerActivity.cpp | |
| parent | d5e322c98d66160b4213cba9302a704c8b10894b (diff) | |
| download | powder-5ee1c7ff801b475b4447c5ee6db4a77d0f75f532.zip powder-5ee1c7ff801b475b4447c5ee6db4a77d0f75f532.tar.gz | |
Fix incorrect deco colors being selected
Diffstat (limited to 'src/colourpicker/ColourPickerActivity.cpp')
| -rw-r--r-- | src/colourpicker/ColourPickerActivity.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/colourpicker/ColourPickerActivity.cpp b/src/colourpicker/ColourPickerActivity.cpp index 9436311..65bccc9 100644 --- a/src/colourpicker/ColourPickerActivity.cpp +++ b/src/colourpicker/ColourPickerActivity.cpp @@ -39,8 +39,6 @@ ColourPickerActivity::ColourPickerActivity(ui::Colour initialColour, ColourPicke g = format::StringToNumber<int>(a->gValue->GetText()); b = format::StringToNumber<int>(a->bValue->GetText()); alpha = format::StringToNumber<int>(a->aValue->GetText()); - RGB_to_HSV(r, g, b, &a->currentHue, &a->currentSaturation, &a->currentValue); - if (r > 255) r = 255; if (g > 255) @@ -49,6 +47,8 @@ ColourPickerActivity::ColourPickerActivity(ui::Colour initialColour, ColourPicke b = 255; if (alpha > 255) alpha = 255; + + RGB_to_HSV(r, g, b, &a->currentHue, &a->currentSaturation, &a->currentValue); a->currentAlpha = alpha; a->UpdateTextboxes(r, g, b, alpha); } @@ -89,7 +89,9 @@ ColourPickerActivity::ColourPickerActivity(ui::Colour initialColour, ColourPicke void ActionCallback(ui::Button * sender) { 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); if(a->callback) a->callback->ColourPicked(col); |