Merge pull request #2641 from dingpinglv/Iss2024_TextStyle

Fixed #2024: Added font-style and font-weight functions to cc.LabelTTF

Author: dingpinglv

cocos2d/core/labelttf/CCLabelTTF.js

@@ -96,6 +96,10 @@ cc.LabelTTF = cc.Sprite.extend(/** @lends cc.LabelTTF# */{
 
     _lineHeight: 0,
 
+    //for web
+    _fontStyle: "normal",
+    _fontWeight: "normal",
+
     /**
      * Initializes the cc.LabelTTF with a font name, alignment, dimension and font size, do not call it by yourself,
      * you should pass the correct arguments in constructor to initialize the label.
@@ -126,7 +130,7 @@ cc.LabelTTF = cc.Sprite.extend(/** @lends cc.LabelTTF# */{
         this._vAlignment = vAlignment;
 
         this._fontSize = fontSize;
-        this._renderCmd._setFontStyle(this._fontName, fontSize);
+        this._renderCmd._setFontStyle(this._fontName, fontSize, this._fontStyle, this._fontWeight);
         this.string = strInfo;
         this._renderCmd._setColorsString();
         this._renderCmd._updateTexture();
@@ -500,7 +504,7 @@ cc.LabelTTF = cc.Sprite.extend(/** @lends cc.LabelTTF# */{
 
         this._fontName = textDefinition.fontName;
         this._fontSize = textDefinition.fontSize || 12;
-        this._renderCmd._setFontStyle(this._fontName, this._fontSize)
+        this._renderCmd._setFontStyle(this._fontName, this._fontSize, this._fontStyle, this._fontWeight);
 
         // shadow
         if (textDefinition.shadowEnabled)
@@ -666,7 +670,7 @@ cc.LabelTTF = cc.Sprite.extend(/** @lends cc.LabelTTF# */{
     setFontSize: function (fontSize) {
         if (this._fontSize !== fontSize) {
             this._fontSize = fontSize;
-            this._renderCmd._setFontStyle(this._fontName, this._fontSize);
+            this._renderCmd._setFontStyle(this._fontName, this._fontSize, this._fontStyle, this._fontWeight);
             // Force update
             this._setUpdateTextureDirty();
         }
@@ -679,7 +683,7 @@ cc.LabelTTF = cc.Sprite.extend(/** @lends cc.LabelTTF# */{
     setFontName: function (fontName) {
         if (this._fontName && this._fontName != fontName) {
             this._fontName = fontName;
-            this._renderCmd._setFontStyle(this._fontName, this._fontSize);
+            this._renderCmd._setFontStyle(this._fontName, this._fontSize, this._fontStyle, this._fontWeight);
             // Force update
             this._setUpdateTextureDirty();
         }
@@ -693,7 +697,7 @@ cc.LabelTTF = cc.Sprite.extend(/** @lends cc.LabelTTF# */{
         if (res) {
             this._fontSize = parseInt(res[1]);
             this._fontName = res[2];
-            this._renderCmd._setFontStyle(this._fontName, this._fontSize);
+            this._renderCmd._setFontStyle(this._fontName, this._fontSize, this._fontStyle, this._fontWeight);
 
             // Force update
             this._setUpdateTextureDirty();
@@ -731,6 +735,31 @@ cc.LabelTTF = cc.Sprite.extend(/** @lends cc.LabelTTF# */{
             return new cc.LabelTTF.CanvasRenderCmd(this);
         else
             return new cc.LabelTTF.WebGLRenderCmd(this);
+    },
+
+    //For web only
+    _setFontStyle: function(fontStyle){
+        if (this._fontStyle != fontStyle) {
+            this._fontStyle = fontStyle;
+            this._renderCmd._setFontStyle(this._fontName, this._fontSize, this._fontStyle, this._fontWeight);
+            this._setUpdateTextureDirty();
+        }
+    },
+
+    _getFontStyle: function(){
+        return this._fontStyle;
+    },
+
+    _setFontWeight: function(fontWeight){
+        if (this._fontWeight != fontWeight) {
+            this._fontWeight = fontWeight;
+            this._renderCmd._setFontStyle(this._fontName, this._fontSize, this._fontStyle, this._fontWeight);
+            this._setUpdateTextureDirty();
+        }
+    },
+
+    _getFontWeight: function(){
+        return this._fontWeight;
     }
 });
 

cocos2d/core/labelttf/CCLabelTTFCanvasRenderCmd.js

@@ -72,8 +72,8 @@ cc.LabelTTF._firsrEnglish = /^[a-zA-Z0-9ÄÖÜäöüßéèçàùêâîôû]/;
         return this._labelContext;
     };
 
-    proto._setFontStyle = function (fontName, fontSize) {
-        this._fontStyleStr = fontSize + "px '" + fontName + "'";
+    proto._setFontStyle = function (fontName, fontSize, fontStyle, fontWeight) {
+        this._fontStyleStr = fontStyle + " " + fontWeight + " " + fontSize + "px '" + fontName + "'";
         this._fontClientHeight = cc.LabelTTF.__getFontHeightByDiv(fontName, fontSize);
     };
 
@@ -161,21 +161,24 @@ cc.LabelTTF._firsrEnglish = /^[a-zA-Z0-9ÄÖÜäöüßéèçàùêâîôû]/;
         //get offset for stroke and shadow
         if (locDimensionsWidth === 0) {
             if (this._isMultiLine)
-                locSize = cc.size(0 | (Math.max.apply(Math, locLineWidth) + locStrokeShadowOffsetX),
-                        0 | ((this._fontClientHeight * this._strings.length) + locStrokeShadowOffsetY));
+                locSize = cc.size(Math.ceil(Math.max.apply(Math, locLineWidth) + locStrokeShadowOffsetX),
+                        Math.ceil((this._fontClientHeight * this._strings.length) + locStrokeShadowOffsetY));
             else
-                locSize = cc.size(0 | (this._measure(node._string) + locStrokeShadowOffsetX), 0 | (this._fontClientHeight + locStrokeShadowOffsetY));
+                locSize = cc.size(Math.ceil(this._measure(node._string) + locStrokeShadowOffsetX), Math.ceil(this._fontClientHeight + locStrokeShadowOffsetY));
         } else {
             if (node._dimensions.height === 0) {
                 if (this._isMultiLine)
-                    locSize = cc.size(0 | (locDimensionsWidth + locStrokeShadowOffsetX), 0 | ((node.getLineHeight() * this._strings.length) + locStrokeShadowOffsetY));
+                    locSize = cc.size(Math.ceil(locDimensionsWidth + locStrokeShadowOffsetX), Math.ceil((node.getLineHeight() * this._strings.length) + locStrokeShadowOffsetY));
                 else
-                    locSize = cc.size(0 | (locDimensionsWidth + locStrokeShadowOffsetX), 0 | (node.getLineHeight() + locStrokeShadowOffsetY));
+                    locSize = cc.size(Math.ceil(locDimensionsWidth + locStrokeShadowOffsetX), Math.ceil(node.getLineHeight() + locStrokeShadowOffsetY));
             } else {
                 //dimension is already set, contentSize must be same as dimension
-                locSize = cc.size(0 | (locDimensionsWidth + locStrokeShadowOffsetX), 0 | (node._dimensions.height + locStrokeShadowOffsetY));
+                locSize = cc.size(Math.ceil(locDimensionsWidth + locStrokeShadowOffsetX), Math.ceil(node._dimensions.height + locStrokeShadowOffsetY));
             }
         }
+        if(node._getFontStyle() != "normal"){    //add width for 'italic' and 'oblique'
+            locSize.width = Math.ceil(locSize.width + node._fontSize * 0.3);
+        }
         node.setContentSize(locSize);
         node._strokeShadowOffsetX = locStrokeShadowOffsetX;
         node._strokeShadowOffsetY = locStrokeShadowOffsetY;