Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix text color parser for TextField widget

This commit is contained in:
pandamicro 2015-11-19 17:17:17 +08:00
parent 5bc73c6ede
commit 0893d7d4ff
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
cocos/scripting/js-bindings/script/studio/parsers/uiParser-1.x.js
View File

@ -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 = [

2
web

@ -1 +1 @@
Subproject commit 9f65531571443d7ea81beb86c3a7b5c2659057d0
Subproject commit 56c240983a8c7a6b221f840e3c45ed3d733ef102