mirror/The-Powder-Toy
1
0
Fork 0
mirror of https://github.com/The-Powder-Toy/The-Powder-Toy.git synced 2025-08-30 19:29:52 +02:00
Code Issues Projects Releases Wiki Activity

Make number boxes easier to use, plus limit deco editor numbers to 255

Browse Source
This commit is contained in:
jacob1
2012-09-19 17:31:18 -04:00
committed by Simon Robertshaw
parent bb08de4544
commit a4f12d367b
2 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/colourpicker/ColourPickerActivity.cpp
View File

@@ -33,12 +33,22 @@ ColourPickerActivity::ColourPickerActivity(ui::Colour initialColour, ColourPicke
void TextChangedCallback(ui::Textbox * sender) void TextChangedCallback(ui::Textbox * sender)
{ {
int r, g, b; int r, g, b, alpha;
r = format::StringToNumber<int>(a->rValue->GetText()); r = format::StringToNumber<int>(a->rValue->GetText());
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());
a->currentAlpha = format::StringToNumber<int>(a->aValue->GetText());
RGB_to_HSV(r, g, b, &a->currentHue, &a->currentSaturation, &a->currentValue); 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());
} }
}; };

4
src/interface/Textbox.cpp
View File

@@ -412,10 +412,6 @@ void Textbox::OnVKeyPress(int key, Uint16 character, bool shift, bool ctrl, bool
//Remove extra preceding 0's //Remove extra preceding 0's
while(backingText[0] == '0' && backingText.length()>1) while(backingText[0] == '0' && backingText.length()>1)
backingText.erase(backingText.begin()); backingText.erase(backingText.begin());
//If there is no content, replace with 0
if(!backingText.length())
backingText = "0";
} }
if(cursor > backingText.length()) if(cursor > backingText.length())
cursor = backingText.length(); cursor = backingText.length();