Skip to content

Commit c8af0a9

Browse files
committed
Fixed a bug of cc.LabelTTF that its setColor doesn't set shadowColor on CanvasMode
1 parent 2bc0703 commit c8af0a9

File tree

1 file changed

+8
-6
lines changed

1 file changed

+8
-6
lines changed

cocos2d/core/labelttf/CCLabelTTFCanvasRenderCmd.js

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -412,12 +412,14 @@ cc.LabelTTF._firsrEnglish = /^[a-zA-Z0-9ÄÖÜäöüßéèçàùêâîôû]/;
412412
var locDisplayColor = this._displayedColor, node = this._node,
413413
locShadowColor = node._shadowColor || this._displayedColor;
414414
var locStrokeColor = node._strokeColor, locFontFillColor = node._textFillColor;
415-
416-
this._shadowColorStr = "rgba(" + (0 | (locShadowColor.r)) + "," + (0 | (locShadowColor.g)) + "," + (0 | (locShadowColor.b)) + "," + node._shadowOpacity + ")";
417-
this._fillColorStr = "rgba(" + (0 | (locDisplayColor.r / 255 * locFontFillColor.r)) + "," + (0 | (locDisplayColor.g / 255 * locFontFillColor.g)) + ","
418-
+ (0 | (locDisplayColor.b / 255 * locFontFillColor.b)) + ", 1)"; //use globalOpacity + locDisplayedOpacity / 255 + ")";
419-
this._strokeColorStr = "rgba(" + (0 | (locDisplayColor.r / 255 * locStrokeColor.r)) + "," + (0 | (locDisplayColor.g / 255 * locStrokeColor.g)) + ","
420-
+ (0 | (locDisplayColor.b / 255 * locStrokeColor.b)) + ", 1)"; //use globalOpacity + locDisplayedOpacity / 255 + ")";
415+
var dr = locDisplayColor.r / 255, dg = locDisplayColor.g / 255, db = locDisplayColor.b / 255;
416+
417+
this._shadowColorStr = "rgba(" + (0 | (dr * locShadowColor.r)) + "," + (0 | ( dg * locShadowColor.g)) + ","
418+
+ (0 | (db * locShadowColor.b)) + "," + node._shadowOpacity + ")";
419+
this._fillColorStr = "rgba(" + (0 | (dr * locFontFillColor.r)) + "," + (0 | (dg * locFontFillColor.g)) + ","
420+
+ (0 | (db * locFontFillColor.b)) + ", 1)";
421+
this._strokeColorStr = "rgba(" + (0 | (dr * locStrokeColor.r)) + "," + (0 | (dg * locStrokeColor.g)) + ","
422+
+ (0 | (db * locStrokeColor.b)) + ", 1)";
421423
};
422424

423425
proto._updateColor = function(){

0 commit comments

Comments
 (0)