Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix label color #6

Merged
merged 2 commits into from
Dec 7, 2015
Merged

Fix label color #6

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2079439
try to fix label color
dabingnn Dec 7, 2015
af4b65c
Merge branch 'master' into fix-label-color
dabingnn Dec 7, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
try to fix label color
  • Loading branch information
@dabingnn
dabingnn committed Dec 7, 2015
commit 2079439ac71b4f6cec9df6b5cf40abe8c0892f55
9 changes: 8 additions & 1 deletion cocos2d/labels/CCLabelCanvasRenderCmd.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,7 @@
}
return lines;
};

proto._updateDisplayOpacity = function(parentOpacity) {
cc.Node.RenderCmd.prototype._updateDisplayOpacity.call(this, parentOpacity);
//specify opacity to quad
Expand All @@ -111,7 +112,13 @@
quad._tr.colors = color;
this._quadDirty = true;
};


proto._updateDisplayColor = function (parentColor) {
cc.Node.RenderCmd.prototype._updateDisplayColor.call(this, parentColor);
var node = this._node;
node._labelSkinDirty = true;
};

proto._bakeLabel = function() {
var node = this._node;
this._drawFontsize = node._fontSize;
Expand Down