diff options
| author | jacob1 <jfu614@gmail.com> | 2012-09-19 21:31:18 (GMT) |
|---|---|---|
| committer | Simon Robertshaw <simon@hardwired.org.uk> | 2012-09-25 19:05:28 (GMT) |
| commit | a4f12d367b8575a051705883ea23796607dc5165 (patch) | |
| tree | 8b089fcfbb2a8025c5f09eee7bc496e2d320b7ca /src/colourpicker/ColourPickerActivity.cpp | |
| parent | bb08de45440408c8775c2f34b87b00c22c49712e (diff) | |
| download | powder-a4f12d367b8575a051705883ea23796607dc5165.zip powder-a4f12d367b8575a051705883ea23796607dc5165.tar.gz | |
Make number boxes easier to use, plus limit deco editor numbers to 255
Diffstat (limited to 'src/colourpicker/ColourPickerActivity.cpp')
| -rw-r--r-- | src/colourpicker/ColourPickerActivity.cpp | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/src/colourpicker/ColourPickerActivity.cpp b/src/colourpicker/ColourPickerActivity.cpp index b712778..16007e1 100644 --- a/src/colourpicker/ColourPickerActivity.cpp +++ b/src/colourpicker/ColourPickerActivity.cpp @@ -33,12 +33,22 @@ ColourPickerActivity::ColourPickerActivity(ui::Colour initialColour, ColourPicke void TextChangedCallback(ui::Textbox * sender) { - int r, g, b; + int r, g, b, alpha; r = format::StringToNumber<int>(a->rValue->GetText()); g = format::StringToNumber<int>(a->gValue->GetText()); b = format::StringToNumber<int>(a->bValue->GetText()); - a->currentAlpha = format::StringToNumber<int>(a->aValue->GetText()); RGB_to_HSV(r, g, b, &a->currentHue, &a->currentSaturation, &a->currentValue); + + if (r > 255) + a->rValue->SetText("255"); + if (g > 255) + a->gValue->SetText("255"); + if (b > 255) + a->bValue->SetText("255"); + alpha = format::StringToNumber<int>(a->aValue->GetText()); + if (alpha > 255) + a->aValue->SetText("255"); + a->currentAlpha = format::StringToNumber<int>(a->aValue->GetText()); } }; |