Merge pull request #685 from Shallowmallow/ColorSelector

ColorPicker - always set pixels

Author: ianharrigan

haxe/ui/components/ColorPicker.hx

@@ -108,7 +108,7 @@ private class ColorPickerImpl extends Box {
                 <stack id="controlsStack" width="100%" selectedIndex="0">
                     <grid id="hsvControls" columns="4" width="100%" style="spacing:0px">
                         <label text="{{hue}}" styleName="text-tiny" />
-                        <slider id="sliderHue" max="360" allowFocus="false" styleName="simple-slider" />
+                        <slider id="sliderHue" max="360" allowFocus="false" styleName="simple-slider" step="1" />
                         <spacer width="5" />
                         <textfield id="inputHue" restrictChars="0-9" styleName="text-tiny" allowFocus="false" />
                         
@@ -168,7 +168,7 @@ private class HSVColorPickerImpl extends ColorPickerImpl {
 
     private override function set_currentColor(value:Null<Color>):Null<Color> {
         _currentColorHSV = ColorUtil.toHSV(value);
-        _currentColorRGBF = ColorUtil.hsvToRGBF(_currentColorHSV.h, _currentColorHSV.s, _currentColorHSV.v);
+        _currentColorRGBF = {r:value.r, g:value.g, b:value.b};
         return super.set_currentColor(value);
     }
 
@@ -253,6 +253,8 @@ private class HSVColorPickerImpl extends ColorPickerImpl {
         var requiresRedraw = true;
         if (_saturationValueGraphLastHue != null && _saturationValueGraphLastHue == _currentColorHSV.h) {
             requiresRedraw = false;
+            // Sometimes html element image data "disappears" so we still need to set pixels
+            saturationValueGraph.componentGraphics.setPixels(_saturationValueGraphBytes);
         }
 
         //Seemingly breaks the color picker for no reason, commenting just in case.
@@ -559,7 +561,7 @@ private class HSVColorPickerImpl extends ColorPickerImpl {
         var b = Std.parseInt("0x" + hexB);
 
         if (_trackingSaturationValue == false && _sliderTracking == false) {
-            applyHSV(ColorUtil.rgbfToHSV(r, g, b));
+            applyRGBA({r:r, g:g, b:b});
         }
     }
 
@@ -572,6 +574,12 @@ private class HSVColorPickerImpl extends ColorPickerImpl {
         _currentColorRGBF = ColorUtil.hsvToRGBF(newHSV.h, newHSV.s, newHSV.v);
         onCurrentColorChanged();
     }
+
+    private function applyRGBA(newRGBF:RGBF) {
+        _currentColorHSV = ColorUtil.rgbfToHSV(newRGBF.r, newRGBF.g, newRGBF.b);
+        _currentColorRGBF = newRGBF;
+        onCurrentColorChanged();
+    }
 
     private var _trackingSaturationValue:Bool = false;
     @:bind(saturationValueGraph, MouseEvent.MOUSE_DOWN)