diff options
| author | jacob1 <jfu614@gmail.com> | 2012-09-19 21:30:30 (GMT) |
|---|---|---|
| committer | Simon Robertshaw <simon@hardwired.org.uk> | 2012-09-25 19:02:44 (GMT) |
| commit | bb08de45440408c8775c2f34b87b00c22c49712e (patch) | |
| tree | 9c8a884efc87aa7977430ed9718d893b8480ca94 /src/colourpicker/ColourPickerActivity.h | |
| parent | 10c6c46e6f2dba8e42b23028fa7c77747a55c9a1 (diff) | |
| download | powder-bb08de45440408c8775c2f34b87b00c22c49712e.zip powder-bb08de45440408c8775c2f34b87b00c22c49712e.tar.gz | |
allow alpha editing
Conflicts:
src/colourpicker/ColourPickerActivity.cpp
Diffstat (limited to 'src/colourpicker/ColourPickerActivity.h')
| -rw-r--r-- | src/colourpicker/ColourPickerActivity.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/colourpicker/ColourPickerActivity.h b/src/colourpicker/ColourPickerActivity.h index 261651e..d3b9dec 100644 --- a/src/colourpicker/ColourPickerActivity.h +++ b/src/colourpicker/ColourPickerActivity.h @@ -18,6 +18,7 @@ class ColourPickerActivity: public WindowActivity { int currentHue; int currentSaturation; int currentValue; + int currentAlpha; bool mouseDown; bool valueMouseDown; @@ -25,6 +26,7 @@ class ColourPickerActivity: public WindowActivity { ui::Textbox * rValue; ui::Textbox * gValue; ui::Textbox * bValue; + ui::Textbox * aValue; ColourPickedCallback * callback; public: |