fix not applying color and add HSL text

Resources/EditorData/AtomicEditor/editor/ui/colorchooser.tb.txt

@@ -28,10 +28,11 @@ TBLayout: axis: y, distribution: gravity, position: left
 			TBInlineSelect: id: alphaselect, min: 0, max: 255, connection: aconn
 			TBSlider: id: alphaslider, min: 0, max: 255, value: 255, connection: aconn
 		TBSeparator: gravity: left right
-		TBLayout: axis: y, gravity: left right
-			TBEditField: id: infotext, text: "#000000", readonly: 1
+		TBLayout: axis: x, distribution: available, gravity: left right
+			TBEditField: id: infohex, text: "#000000", readonly: 1
+				font: size: 16
+			TBEditField: id: infohsl, text: "0.0, 0.0, 0,0", readonly: 1
 				font: size: 16
-				lp: min-width: 180
 	TBSeparator: gravity: left right, skin: AESeparator
 	TBLayout:
 		TBButton: text: Cancel, id: ccancelbutton

Script/AtomicEditor/ui/frames/inspector/AttributeInfoEdit.ts

@@ -24,7 +24,7 @@ import EditorUI = require("ui/EditorUI");
 import InspectorUtils = require("./InspectorUtils");
 import SerializableEditType = require("./SerializableEditType");
 import EditorEvents = require("editor/EditorEvents");
-import ColorChooser = require ("./ColorChooser" );
+import ColorChooser = require("./ColorChooser");
 
 class AttributeInfoEdit extends Atomic.UILayout {
 
@@ -673,13 +673,15 @@ class ColorAttributeEdit extends NumberArrayAttributeEdit {
             this.addChild(selectButton);
 
             selectButton.onClick = () => {
-                new ColorChooser( this.selects[0], this.selects[1], this.selects[2], this.selects[3] );
+
+                    new ColorChooser ( this.selects[0], this.selects[1],
+                        this.selects[2], this.selects[3] );
+
             };
 
-         }
+         };
 
         this.addChild(this.editWidget);
-
     }
 
 
@@ -729,7 +731,7 @@ class ResourceRefAttributeEdit extends AttributeInfoEdit {
             this.nameOverride = attrInfo.resourceTypeName + " " + this.refListIndex;
 
         var importerName = ToolCore.assetDatabase.getResourceImporterName(attrInfo.resourceTypeName);
-        
+
         if (!importerName)
             return false;
 

Script/AtomicEditor/ui/frames/inspector/ColorChooser.ts

@@ -38,11 +38,8 @@ class ColorChooser extends Atomic.UIWindow {
     newcolor : Atomic.UIColorWidget;
     wheel : Atomic.UIColorWheel;
     lslide : Atomic.UISlider;
-    infotext : Atomic.UIEditField;
-    parent_rils : Atomic.UIInlineSelect;
-    parent_gils : Atomic.UIInlineSelect;
-    parent_bils : Atomic.UIInlineSelect;
-    parent_ails : Atomic.UIInlineSelect;
+    infohex : Atomic.UIEditField;
+    infohsl : Atomic.UIEditField;
 
     constructor( pred : Atomic.UIInlineSelect, pgreen : Atomic.UIInlineSelect,
                 pblue : Atomic.UIInlineSelect, palpha : Atomic.UIInlineSelect ) {
@@ -52,10 +49,6 @@ class ColorChooser extends Atomic.UIWindow {
         var view = EditorUI.getView();
         view.addChild(this);
 
-        this.parent_rils = pred;
-        this.parent_gils = pgreen;
-        this.parent_bils = pblue;
-        this.parent_ails = palpha;
         this.text = "Color Chooser";
 
         this.load("AtomicEditor/editor/ui/colorchooser.tb.txt");
@@ -70,7 +63,8 @@ class ColorChooser extends Atomic.UIWindow {
         this.a_sld = <Atomic.UISlider>this.getWidget("alphaslider");
         this.newcolor = <Atomic.UIColorWidget>this.getWidget("colornew" );
         this.oldcolor = <Atomic.UIColorWidget>this.getWidget("colorold" );
-        this.infotext = <Atomic.UIEditField>this.getWidget("infotext" );
+        this.infohex = <Atomic.UIEditField>this.getWidget("infohex" );
+        this.infohsl = <Atomic.UIEditField>this.getWidget("infohsl" );
         this.wheel = <Atomic.UIColorWheel>this.getWidget("colorwheel" );
         this.lslide = <Atomic.UISlider>this.getWidget("lslider");
 
@@ -80,10 +74,23 @@ class ColorChooser extends Atomic.UIWindow {
 
         (<Atomic.UIButton>this.getWidget("cokbutton")).onClick = () => {
 
-            this.parent_rils.setValue( this.rgbhsla[0] / 255 );
-            this.parent_gils.setValue( this.rgbhsla[1] / 255 );
-            this.parent_bils.setValue( this.rgbhsla[2] / 255 );
-            this.parent_ails.setValue( this.rgbhsla[6] / 255 );
+            var rr = this.rgbhsla[0] / 255;
+            var gg = this.rgbhsla[1] / 255;
+            var bb = this.rgbhsla[2] / 255;
+            var aa = this.rgbhsla[6] / 255;
+            var wr = pred;
+			var wg = pgreen;
+			var wb = pblue;
+			var wa = palpha;
+			wr.setValue ( rr );
+ 			wr.sendEvent( "UIWidgetEditComplete", { widget: wr } );
+			wg.setValue ( gg );
+ 			wg.sendEvent( "UIWidgetEditComplete", { widget: wg } );
+			wb.setValue ( bb );
+ 			wb.sendEvent( "UIWidgetEditComplete", { widget: wb } );
+			wa.setValue ( aa );
+ 			wa.sendEvent( "UIWidgetEditComplete", { widget: wa } );
+
             this.close();
         };
 
@@ -93,11 +100,11 @@ class ColorChooser extends Atomic.UIWindow {
         this.center();
         this.setFocus();
 
-        let rx = this.parent_rils.getValue() * 255;
+        let rx = pred.getValue() * 255;
         if ( rx > 255 ) rx = 255;
-        let gx = this.parent_gils.getValue() * 255;
+        let gx = pgreen.getValue() * 255;
         if ( gx > 255 ) gx = 255;
-        let bx = this.parent_bils.getValue() * 255;
+        let bx = pblue.getValue() * 255;
         if ( bx > 255 ) bx = 255;
         let oldcolor = "#";
         var rrr =  Math.round(rx).toString(16);
@@ -113,7 +120,7 @@ class ColorChooser extends Atomic.UIWindow {
 
         Atomic.ui.blockChangedEvents = true;
 
-        this.oldcolor.setAlpha( this.parent_ails.getValue() * 255 );
+        this.oldcolor.setAlpha( palpha.getValue() * 255 );
         this.a_sld.setValue(this.rgbhsla[6]);
 
         Atomic.ui.blockChangedEvents = false;
@@ -277,7 +284,14 @@ class ColorChooser extends Atomic.UIWindow {
 
         this.newcolor.setColor( mycolor );
         this.newcolor.setAlpha( this.rgbhsla[6] / 255 );
-        this.infotext.text = mycolor;
+        this.infohex.text = mycolor;
+
+        let myhsl = Number(this.rgbhsla[3]).toFixed(2);
+        myhsl += ", ";
+        myhsl += Number(this.rgbhsla[4]).toFixed(2);
+        myhsl += ", ";
+        myhsl += Number(this.rgbhsla[5]).toFixed(2);
+        this.infohsl.text = myhsl;
     }
 
 }