Fix text color parser for TextField widget

fumingxing2015 · Nov 19, 2015 · 0893d7d · 0893d7d
1 parent 5bc73c6
commit 0893d7d
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/cocos/scripting/js-bindings/script/studio/parsers/uiParser-1.x.js b/cocos/scripting/js-bindings/script/studio/parsers/uiParser-1.x.js
@@ -662,6 +662,13 @@
         var va = options["vAlignment"];
         if(va)
             widget.setTextVerticalAlignment(va);
+
+        var r = options["colorR"];
+        var g = options["colorG"];
+        var b = options["colorB"];
+        if (r !== undefined && g !== undefined && b !== undefined) {
+            widget.setTextColor(cc.color(r, g, b));
+        }
     };
 
     var register = [

diff --git a/web b/web
+1 −1		cocos2d/actions/CCActionInstant.js
+5 −1		cocos2d/audio/CCAudio.js
+9 −0		extensions/cocostudio/action/CCActionNode.js
+7 −0		extensions/cocostudio/loader/parsers/uiParser-1.x.js